From 4f69adeb9502ac85ebed3f99275fc6fa2d14effb Mon Sep 17 00:00:00 2001 From: lukeyan <1727408482@qq.com> Date: Fri, 18 Aug 2023 21:21:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AD=A6=E6=83=85=E9=80=9A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/safetyIndex/red02.png | Bin 0 -> 2224 bytes src/utils/request.js | 4 +- .../compositeIndex/components/endanger.vue | 70 +++++++++ .../components/notification.vue | 134 +++++++++++++++++- src/views/compositeIndex/index.vue | 8 +- 5 files changed, 208 insertions(+), 8 deletions(-) create mode 100644 src/assets/safetyIndex/red02.png create mode 100644 src/views/compositeIndex/components/endanger.vue diff --git a/src/assets/safetyIndex/red02.png b/src/assets/safetyIndex/red02.png new file mode 100644 index 0000000000000000000000000000000000000000..a69a5d67c68174e1d5614fc8691608da1cbcde9d GIT binary patch literal 2224 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 + + + \ 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 @@
-
警情通报
+
+
    +
  • + +
    +
    +
    +
    +
    + {{ item.caseName }} +
    +
    +
    企业名称：{{ item.caseAddress }}
    +
    时间：{{ item.registerTime }}
    +
    +
    +
    • +
+
@@ -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 {}; -- 2.36.3 From c8228f35588c5a0cb4725ce4784bf21878673c26 Mon Sep 17 00:00:00 2001 From: lukeyan <1727408482@qq.com> Date: Fri, 18 Aug 2023 21:24:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 56dd381..bbddc92 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' }, }) -- 2.36.3