diff --git a/src/assets/index/map-liaoning.jpg b/src/assets/index/map-liaoning.jpg new file mode 100644 index 0000000..4c3ec5e Binary files /dev/null and b/src/assets/index/map-liaoning.jpg differ diff --git a/src/assets/screen/index/map-care-div-1.png b/src/assets/screen/index/map-care-div-1.png index b4f7f08..18cfc99 100644 Binary files a/src/assets/screen/index/map-care-div-1.png and b/src/assets/screen/index/map-care-div-1.png differ diff --git a/src/assets/screen/index/map-care-div-2.png b/src/assets/screen/index/map-care-div-2.png index 07bf4c7..1298636 100644 Binary files a/src/assets/screen/index/map-care-div-2.png and b/src/assets/screen/index/map-care-div-2.png differ diff --git a/src/assets/screen/index/map-care-div-3.png b/src/assets/screen/index/map-care-div-3.png index b30e62d..21e1705 100644 Binary files a/src/assets/screen/index/map-care-div-3.png and b/src/assets/screen/index/map-care-div-3.png differ diff --git a/src/assets/screen/index/map-care-div-4.png b/src/assets/screen/index/map-care-div-4.png index 247e539..bc14d3b 100644 Binary files a/src/assets/screen/index/map-care-div-4.png and b/src/assets/screen/index/map-care-div-4.png differ diff --git a/src/assets/screen/index/map-care-div-5.png b/src/assets/screen/index/map-care-div-5.png index 960aac6..ced989d 100644 Binary files a/src/assets/screen/index/map-care-div-5.png and b/src/assets/screen/index/map-care-div-5.png differ diff --git a/src/assets/screen/index/map-care-div-6.png b/src/assets/screen/index/map-care-div-6.png index 0388fba..7265451 100644 Binary files a/src/assets/screen/index/map-care-div-6.png and b/src/assets/screen/index/map-care-div-6.png differ diff --git a/src/assets/screen/index/map-legend.png b/src/assets/screen/index/map-legend.png index f20be3e..897e618 100644 Binary files a/src/assets/screen/index/map-legend.png and b/src/assets/screen/index/map-legend.png differ diff --git a/src/assets/screen/index/map-liaoning.png b/src/assets/screen/index/map-liaoning.png new file mode 100644 index 0000000..2e5a39b Binary files /dev/null and b/src/assets/screen/index/map-liaoning.png differ diff --git a/src/assets/screen/index/right-rate.png b/src/assets/screen/index/right-rate.png new file mode 100644 index 0000000..96f2d88 Binary files /dev/null and b/src/assets/screen/index/right-rate.png differ diff --git a/src/assets/screen/index/screen-map-popover.png b/src/assets/screen/index/screen-map-popover.png new file mode 100644 index 0000000..f3674e2 Binary files /dev/null and b/src/assets/screen/index/screen-map-popover.png differ diff --git a/src/utils/request.js b/src/utils/request.js index ffb0d21..80bf10b 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -17,7 +17,7 @@ const service = axios.create({ // axios中请求配置有baseURL选项,表示请求URL公共部分 baseURL: process.env.VUE_APP_BASE_API, // 超时 - timeout: 10000 + timeout: 30000 }) // request拦截器 diff --git a/src/views/big-screen/disease-components/traffic-log.vue b/src/views/big-screen/disease-components/traffic-log.vue index 4669215..b9ee261 100644 --- a/src/views/big-screen/disease-components/traffic-log.vue +++ b/src/views/big-screen/disease-components/traffic-log.vue @@ -692,6 +692,10 @@ export default { // 修改日期选择器头部样式 .el-date-range-picker__header { color: #c0c0c0; + + .el-picker-panel__icon-btn { + color: #c0c0c0; + } } // 修改弹出层边框颜色 diff --git a/src/views/big-screen/disease-components/traffic-safety.vue b/src/views/big-screen/disease-components/traffic-safety.vue index 83fbedc..52ec406 100644 --- a/src/views/big-screen/disease-components/traffic-safety.vue +++ b/src/views/big-screen/disease-components/traffic-safety.vue @@ -2,7 +2,7 @@ * @Author: SunTao 328867980@qq.com * @Date: 2024-10-21 09:59:32 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2024-12-10 10:52:10 + * @LastEditTime: 2024-12-16 17:07:19 * @FilePath: \znxjxt-ui\src\views\big-screen\disease-components\traffic-safety.vue * @Description: 病害巡检大屏-今日巡查 --> @@ -14,36 +14,66 @@
- {{ all }}个 + {{ all }}
-
- 较昨日{{ state }}{{ state - }} {{ count }}个 - - +
+ {{ count }}个 + + + +
+
+ {{ state }} + {{ state }} +
- +
- - + +
- - + +
@@ -71,7 +101,7 @@ export default { data() { return { // 新增病害数 - today: 0, + today: "0", // 病害总数 all: 0, // 病害增长率 @@ -79,7 +109,7 @@ export default { // 较昨日增长、减少 state: "——", // 增长、减少数量 - count: "——", + count: "0", // 弹窗显隐控制 showDialogVisible: false, // 左侧路段选择绑定 @@ -306,6 +336,7 @@ export default { axisLabel: { color: "rgba(255,255,255,0.65)", }, + minInterval: 1, splitLine: { lineStyle: { color: "rgba(255,255,255,0.2)", @@ -507,6 +538,7 @@ export default { axisLabel: { color: "rgba(255,255,255,0.65)", }, + minInterval: 1, splitLine: { lineStyle: { color: "rgba(255,255,255,0.2)", @@ -627,9 +659,7 @@ export default { span { cursor: pointer; font-family: "DouYu"; - background: linear-gradient(to bottom, - #ffffff, - #2773d0); + background: linear-gradient(to bottom, #ffffff, #2773d0); /*设置渐变的方向从左到右 颜色从ff0000到ffff00*/ background-clip: text; /*将设置的背景颜色限制在文字中*/ @@ -652,7 +682,7 @@ export default { width: 100%; height: 45%; display: flex; - padding-left: 1rem; + padding-left: 2rem; justify-content: center; line-height: 3rem; // background-image: url("../../../assets/screen/traffic/right-sum.png"); @@ -665,12 +695,9 @@ export default { span { margin-right: 0.5rem; - - font-size: 1.2rem; + font-size: 1rem; font-family: "DouYu"; - background: linear-gradient(to bottom, - #ffffff, - #21f1e1); + background: linear-gradient(to bottom, #ffffff, #21f1e1); /*设置渐变的方向从左到右 颜色从ff0000到ffff00*/ background-clip: text; /*将设置的背景颜色限制在文字中*/ @@ -679,42 +706,61 @@ export default { } } - // .right-rate { - // width: 100%; - // height: 4rem; - // display: flex; - // justify-content: center; - // padding-left: 1rem; - // line-height: 3rem; - // // background-image: url("../../../assets/screen/traffic/right-rate.png"); - // background-image: url("~@/assets/screen/disease/right-rate.png"); - // background-repeat: no-repeat; - // background-size: 100%; - // background-position: 100% 50%; - // color: #aac6c7; - // font-size: 0.9rem; - - // span { - // margin-right: 0.5rem; - // font-size: 1.2rem; - // font-family: "DouYu"; - // background: linear-gradient( - // to bottom, - // #ffffff, - // #e9bc5c - // ); /*设置渐变的方向从左到右 颜色从ff0000到ffff00*/ - // background-clip: text; /*将设置的背景颜色限制在文字中*/ - // -webkit-text-fill-color: transparent; /*给文字设置成透明*/ - // } - // } - .right-rate { width: 100%; height: 45%; display: flex; + flex-direction: column; align-items: center; - font-family: "DouYu"; font-size: 1rem; + background: url("~@/assets/screen/index/right-rate.png") no-repeat; + background-size: 100%; + background-position: 100% 50%; + color: #aac6c7; + + .right-rate-top { + width: 100%; + height: 50%; + padding-left: 3rem; + display: flex; + justify-content: center; + align-items: flex-end; + + span { + font-size: 1rem; + font-weight: 800; + font-family: "DouYu"; + margin-right: 0.5rem; + background: linear-gradient(to bottom, #ffffff, #9e7a06); + /*设置渐变的方向从左到右 颜色从ff0000到ffff00*/ + background-clip: text; + /*将设置的背景颜色限制在文字中*/ + -webkit-text-fill-color: transparent; + /*给文字设置成透明*/ + } + + .el-icon-top { + font-size: 1.5rem; + color: red; + } + + .el-icon-bottom, + .el-icon-minus { + font-size: 1.5rem; + color: #19eb27; + } + } + + .right-rate-bottom { + width: 100%; + height: 50%; + padding-left: 55%; + + span { + font-size: 0.7rem; + font-family: "DouYu"; + } + } .up { color: #ff2e2e; @@ -725,17 +771,6 @@ export default { color: #19eb27; padding: 0 0.5rem; } - - - .el-icon-top { - font-size: 1.5rem; - color: red; - } - - .el-icon-bottom { - font-size: 1.5rem; - color: #19eb27; - } } } } @@ -763,7 +798,7 @@ export default { // height: 10%; display: flex; - >div { + > div { width: 50%; padding: 0 2rem; diff --git a/src/views/big-screen/disease-components/traffic-statistic.vue b/src/views/big-screen/disease-components/traffic-statistic.vue index 95aaf37..014cff8 100644 --- a/src/views/big-screen/disease-components/traffic-statistic.vue +++ b/src/views/big-screen/disease-components/traffic-statistic.vue @@ -2,7 +2,7 @@ * @Author: SunTao 328867980@qq.com * @Date: 2024-10-21 10:06:24 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2024-11-19 09:35:47 + * @LastEditTime: 2024-12-13 17:09:48 * @FilePath: \znxjxt-ui\src\views\big-screen\traffic-components\traffic-statistic.vue * @Description: 病害巡检大屏-病害统计 --> @@ -181,8 +181,8 @@ export default { left: "center", top: "50%", textStyle: { - fontFamily: "DinBm", - fontSize: 15, + fontFamily: "DouYu", + fontSize: 14, color: "#ffffff", }, }, @@ -192,7 +192,7 @@ export default { top: "40%", textStyle: { fontFamily: "DouYu", - fontSize:15, + fontSize: 15, color: "rgba(255, 183, 89, 0.8)", }, }, @@ -293,7 +293,8 @@ export default { display: flex; align-items: center; color: #808c9f; - font-size: 0.7rem; + font-size: 0.6rem; + font-family: "DouYu"; .index { width: 0.8rem; diff --git a/src/views/big-screen/index.vue b/src/views/big-screen/index.vue index 1d5e50f..a327086 100644 --- a/src/views/big-screen/index.vue +++ b/src/views/big-screen/index.vue @@ -2,7 +2,7 @@ * @Author: SunTao 328867980@qq.com * @Date: 2024-10-17 11:34:00 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2024-12-13 10:44:04 + * @LastEditTime: 2024-12-16 17:42:38 * @FilePath: \znxjxt-ui\src\views\big-screen\index.vue * @Description: 大屏首页 --> @@ -163,27 +163,38 @@
+ +
+ +
+ 病害类型筛选: + +
+ +
+ 返回 +
-
-
- -
- 病害类型筛选: - -
+
+
- {{ item.name }} + +
+
+
+ 路面病害:65431213个 +
+
+ 每公里平均病害:65431213个 +
+
+
+
+ 交安设施病害:65431213个 +
+
+ 每公里平均病害:65431213个 +
+
+
+
+ 桥隧病害:65431213个 +
+
+ 每公里平均病害:65431213个 +
+
+
+
+ 绿化问题:65431213个 +
+
+ 每公里平均问题:65431213个 +
+
+
+ {{ + item.name + }} +
- + + + -