diff --git a/config.js b/config.js
index 01b2edd..41d0b51 100644
--- a/config.js
+++ b/config.js
@@ -1,8 +1,8 @@
// 应用全局配置
module.exports = {
// baseUrl: 'https://www.nuoyunr.com/admin-api',
- // baseUrl: 'http://127.0.0.1:48080/admin-api',
- baseUrl: 'http://uncs3q.natappfree.cc/admin-api',
+ baseUrl: 'http://127.0.0.1:48080/admin-api',
+ // baseUrl: 'http://uncs3q.natappfree.cc/admin-api',
imagesUrl: 'http://www.nuoyunr.com/lananRsc',
baseImageUrl: 'https://www.nuoyunr.com/minio',
wsUrl: 'ws://127.0.0.1:48080',
diff --git a/pages/index/synthesis.vue b/pages/index/synthesis.vue
index 7ffcad7..93e9da4 100644
--- a/pages/index/synthesis.vue
+++ b/pages/index/synthesis.vue
@@ -41,113 +41,88 @@
+ {{ threenum.todayOrderNum }}
当日订单
- {{ threenum.todayOrderNum }}
+
+ {{ threenum.hgNum }}
合规合格
- {{ threenum.hgNum }}
+
+ {{ threenum.srlNum }}
双燃料合格
- {{ threenum.srlNum }}
+
-
+
+
+
+ {{ dateStr || '' }} {{ week || '' }} {{ time || '' }}
+
功能管理
-
+
检测站的信息管理
-
+
业务管理
-
+
检测站的业务统计
-
+
通知提醒
-
+
查看通知、提醒
-
+
内部管理
-
+
方便 简单 快捷
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 今天是{{ dateStr || '' }} {{ week || '' }} {{ time || '' }}
-
+
+
+
@@ -500,10 +475,11 @@ export default {
height: calc(100vh);
// background-color: #F4F4F4;
background-color: cornflowerblue;
+ background: linear-gradient( 180deg, rgba(1,116,246,0.7) 0%, rgba(1,116,246,0) 100%);
// background: url('http://www.nuoyunr.com/lananRsc/jcbjt.png') center no-repeat;
- background: url('../../static/detection/mybj.png') no-repeat;
- background-size: 100% 100%;
- position: relative;
+ // background: url('../../static/detection/mybj.png') no-repeat;
+ // background-size: 100% 100%;
+ // position: relative;
}
.c-top {
@@ -578,13 +554,20 @@ export default {
color: #FFFFFF;
margin-left: 5px;
}
-
+.new_box{
+ background: #fff;
+ margin-top: 15px;
+ border-radius: 6px;
+}
.gangbox {
width: 100%;
display: flex;
justify-content: space-between;
flex-wrap: wrap;
- margin-top: 10px;
+
+ background: #fff;
+ box-sizing: border-box;
+ padding: 10px;
}
@@ -607,10 +590,15 @@ export default {
box-sizing: border-box;
padding: 15px;
background-color: #d0e5ff;
- height: 130px;
+ height: 90px;
border-radius: 10px;
margin-top: 10px;
font-weight: bold;
+ background: url('../../static/imgs/new1.png') no-repeat;
+ background-size: 100% 100%;
+ color: #fff;
+ // position: relative;
+
}
.ang-box2 {
@@ -618,10 +606,13 @@ export default {
box-sizing: border-box;
padding: 15px;
background-color: #fdfcd4;
- height: 130px;
+ height: 90px;
border-radius: 10px;
margin-top: 10px;
font-weight: bold;
+ background: url('../../static/imgs/new2.png') no-repeat;
+ background-size: 100% 100%;
+ color: #fff;
}
.ang-box3 {
@@ -629,10 +620,12 @@ export default {
box-sizing: border-box;
padding: 15px;
background-color: #ede6ff;
- height: 130px;
- border-radius: 10px;
+ height: 90px; border-radius: 10px;
margin-top: 10px;
font-weight: bold;
+ background: url('../../static/imgs/new3.png') no-repeat;
+ background-size: 100% 100%;
+ color: #fff;
}
.ang-box4 {
@@ -640,10 +633,13 @@ export default {
box-sizing: border-box;
padding: 15px;
background-color: #c9f9af;
- height: 130px;
+ height: 90px;
border-radius: 10px;
margin-top: 10px;
font-weight: bold;
+ background: url('../../static/imgs/new4.png') no-repeat;
+ background-size: 100% 100%;
+ color: #fff;
}
.san-box {
@@ -711,15 +707,13 @@ export default {
.dqtime {
- width: 100%;
+
display: flex;
align-items: center;
- justify-content: flex-end;
- margin-top: 15px;
- font-weight: bold;
- position: fixed;
- bottom: 55px;
- right: 10px;
+ border-bottom: 1px solid #dedede;
+ box-sizing: border-box;padding: 15px;
+
+
}
.baizi {
@@ -731,9 +725,13 @@ export default {
.threebox {
width: 100%;
display: flex;
+ background: #fff;
+ border-radius: 8px;
justify-content: space-between;
align-items: center;
margin-top: 30px;
+ box-sizing: border-box;
+padding: 10px;
}
.t-box {
@@ -744,7 +742,7 @@ export default {
.xbai {
font-size: 15px;
font-weight: 400;
- color: #FFFFFF;
+ color: #000;
margin-bottom: 5px;
}
@@ -759,7 +757,7 @@ export default {
.dbai {
font-size: 25px;
font-weight: 600;
- color: #FFFFFF;
+ color: #000;
margin-bottom: 5px;
}
@@ -803,6 +801,7 @@ export default {
align-items: center;
font-size: 22px;
justify-content: space-between;
+ margin-bottom: 15px;
}
.f-box {