diff --git a/src/assets/safetyIndex/red02.png b/src/assets/safetyIndex/red02.png new file mode 100644 index 0000000..a69a5d6 Binary files /dev/null and b/src/assets/safetyIndex/red02.png differ diff --git a/src/utils/request.js b/src/utils/request.js index bbddc92..56dd381 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -7,8 +7,8 @@ const request = axios.create({ //baseURL: 'http://172.18.113.50:8080/zhapi', //baseURL: 'http://172.18.113.13:8080/zhapi', // 孙强 //baseURL: 'http://192.168.0.188:8888/zhapi', - //baseURL: 'http://121.41.91.94:12002/zhapi', - baseURL: `http://${window.location.host}/zhapi`, + baseURL: 'http://121.41.91.94:12002/zhapi', + //baseURL: `http://${window.location.host}/zhapi`, timeout: 50000, headers: { 'content-type': 'application/json' }, }) diff --git a/src/views/compositeIndex/components/endanger.vue b/src/views/compositeIndex/components/endanger.vue new file mode 100644 index 0000000..e95e58a --- /dev/null +++ b/src/views/compositeIndex/components/endanger.vue @@ -0,0 +1,70 @@ + + + + \ No newline at end of file diff --git a/src/views/compositeIndex/components/notification.vue b/src/views/compositeIndex/components/notification.vue index 66c3e45..e439733 100644 --- a/src/views/compositeIndex/components/notification.vue +++ b/src/views/compositeIndex/components/notification.vue @@ -4,17 +4,66 @@
-
警情通报
+ @@ -48,10 +97,87 @@ export default { } .title_text { width: 4vw; - height: 3.2vh; - line-height: 3.2vh; + height: 3.5vh; + line-height: 3.5vh; text-align: right; } } + .carousel_box { + width: 22vw; + height: 25vh; + margin-top: 2vh; + margin-left: 1vw; + overflow: hidden; + .marquee-list { + padding: 10px; + height: 25vh; + margin: 0px; + li { + width: 100%; + height: 7vh; + margin-bottom: 1vh; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + list-style: none; + line-height: 40px; + text-align: center; + color: #fff; + font-size: 18px; + font-weight: 400; + display: flex; + .icon_box { + width: 3vw; + height: 7vh; + display: flex; + justify-content: center; + align-items: center; + .icon_item { + width: 2.5vw; + height: 5vh; + background: url("~@/assets/safetyIndex/red02.png") no-repeat; + background-size: 100% 100%; + } + } + .message_box { + width: 18vw; + height: 7vh; + .top_message { + width: 18vw; + height: 3.5vh; + line-height: 3.5vh; + color: #d9e7ff; + text-align: left; + font-size: 16px; + font-weight: 600; + } + .bottom_message { + width: 18vw; + height: 3.5vh; + display: flex; + .bottom_message_company { + width: 11vw; + height: 3.5vh; + text-align: left; + line-height: 3.5vh; + color: #fff; + font-size: 14px; + } + .bottom_message_time { + width: 7vw; + height: 3.5vh; + color: #fff; + font-size: 14px; + line-height: 3.5vh; + } + } + } + } + } + .animate-up { + transition: all 0.5s ease-in-out; + transform: translateY(-7vh); + } + } } \ No newline at end of file diff --git a/src/views/compositeIndex/index.vue b/src/views/compositeIndex/index.vue index 7f9466a..d58fc2b 100644 --- a/src/views/compositeIndex/index.vue +++ b/src/views/compositeIndex/index.vue @@ -16,6 +16,8 @@ + + @@ -25,7 +27,8 @@ import CompanyNum from "./components/companyNum"; import Employee from "./components/employee"; import CompanyCar from "./components/companyCar"; import CompanyService from "./components/companyService"; -import Notification from "./components/notification" +import Notification from "./components/notification"; +import Endanger from "./components/endanger" export default { name: "CompositeIndex", components: { @@ -33,7 +36,8 @@ export default { Employee, CompanyCar, CompanyService, - Notification + Notification, + Endanger }, data() { return {};