diff --git a/src/views/compositeIndex/components/companyCar.vue b/src/views/compositeIndex/components/companyCar.vue index 4d505ee..fd03376 100644 --- a/src/views/compositeIndex/components/companyCar.vue +++ b/src/views/compositeIndex/components/companyCar.vue @@ -96,11 +96,11 @@ export default { let dateTemp; let flag = 1; for (let i = 1; i < day; i++) { - dateTemp = year + "-" + month + myDate.getDate(); + dateTemp = year + "-" + month + "-" + myDate.getDate(); dateArray.push(dateTemp); myDate.setDate(myDate.getDate() + flag); } - dateArray.push(year + "-" + month + myDate.getDate()); + dateArray.push(year + "-" + month + "-" + myDate.getDate()); return dateArray; }, // 获取上月前7天数组 @@ -116,11 +116,11 @@ export default { let dateTemp; let flag = 1; for (let i = 1; i < day; i++) { - dateTemp = year + "-" + month + myDate.getDate(); + dateTemp = year + "-" + month + "-" + myDate.getDate(); dateArray.push(dateTemp); myDate.setDate(myDate.getDate() + flag); } - dateArray.push(year + "-" + month + myDate.getDate()); + dateArray.push(year + "-" + month + "-" + myDate.getDate()); return dateArray; }, init_chart() { @@ -183,18 +183,14 @@ export default { axisLine: { onZero: false, lineStyle: { - color: colors[4], + color: "#fff", }, }, axisPointer: { label: { + color: "black", formatter: function (params) { - return ( - params.value + - (params.seriesData.length - ? ":" + params.seriesData[0].data - : "") - ); + return params.value; }, }, }, @@ -209,18 +205,14 @@ export default { axisLine: { onZero: false, lineStyle: { - color: colors[4], + color: "#fff", }, }, axisPointer: { label: { + color: "black", formatter: function (params) { - return ( - params.value + - (params.seriesData.length - ? ":" + params.seriesData[0].data - : "") - ); + return params.value; }, }, }, @@ -249,7 +241,7 @@ export default { emphasis: { focus: "series", }, - data: [2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6], + data: [141, 231, 155, 99, 75, 201, 63], }, { name: "今日出园区", @@ -259,7 +251,7 @@ export default { emphasis: { focus: "series", }, - data: [2.6, 5.9, 9.0, 26, 27, 70.7, 175.6], + data: [34, 45, 59, 44, 34, 61, 55], }, { name: "上月进园区", @@ -268,7 +260,7 @@ export default { emphasis: { focus: "series", }, - data: [3.9, 5.9, 11.1, 18.7, 48.3, 69.2, 231.6], + data: [79, 98, 101, 122, 97, 88, 72], }, { name: "上月出园区", @@ -331,7 +323,7 @@ export default { .in_car { width: 10vw; height: 5vh; - // border: 0.1px solid #495e70; + // display: flex; .in_car_icon { width: 2.5vw; diff --git a/src/views/compositeIndex/components/companyNum.vue b/src/views/compositeIndex/components/companyNum.vue index 921550a..17e26a4 100644 --- a/src/views/compositeIndex/components/companyNum.vue +++ b/src/views/compositeIndex/components/companyNum.vue @@ -239,8 +239,8 @@ export default { height: 8vh; .num_green { width: 6vw; - height: 5vh; - line-height: 5vh; + height: 4vh; + line-height: 4vh; background: linear-gradient(#fff, #00ffd4); background-clip: text; color: transparent; @@ -250,8 +250,8 @@ export default { } .num_orange { width: 6vw; - height: 5vh; - line-height: 5vh; + height: 4vh; + line-height: 4vh; background: linear-gradient(#fff, #fef699); background-clip: text; color: transparent; @@ -261,8 +261,8 @@ export default { } .num_red { width: 6vw; - height: 5vh; - line-height: 5vh; + height: 4vh; + line-height: 4vh; background: linear-gradient(#fff, #ff4b4b); background-clip: text; color: transparent; diff --git a/src/views/compositeIndex/components/notification.vue b/src/views/compositeIndex/components/notification.vue index e439733..4856254 100644 --- a/src/views/compositeIndex/components/notification.vue +++ b/src/views/compositeIndex/components/notification.vue @@ -3,13 +3,12 @@
-
-
+
警情通报
@@ -49,7 +52,6 @@ export default { getList() { caseList().then((res) => { this.notification_list = res.data; - console.log("this.notification_list", this.notification_list); }); }, // 滚动 @@ -126,6 +128,8 @@ export default { font-size: 18px; font-weight: 400; display: flex; + background: url("~@/assets/safetyIndex/0091.png") no-repeat; + background-size: 100% 100%; .icon_box { width: 3vw; height: 7vh; diff --git a/src/views/compositeIndex/index.vue b/src/views/compositeIndex/index.vue index 54405ae..c962d6d 100644 --- a/src/views/compositeIndex/index.vue +++ b/src/views/compositeIndex/index.vue @@ -101,11 +101,10 @@ export default { height: calc(100% - 80px); box-sizing: border-box; position: relative; - // border: 0.1px solid #495e70; .iframeMap { - margin-top: 0.5vh; + // margin-top: 0.5vh; z-index: 0; - height: 90vh; + height: 91vh; } .left_box { position: absolute; @@ -116,7 +115,7 @@ export default { .right_box { position: absolute; width: 24vw; - right: 20px; + right: 14px; top: 0vh; } .select_box { diff --git a/src/views/enterpriseArchives/componets/card.vue b/src/views/enterpriseArchives/componets/card.vue index f6c21c5..97147a3 100644 --- a/src/views/enterpriseArchives/componets/card.vue +++ b/src/views/enterpriseArchives/componets/card.vue @@ -1,257 +1,277 @@ \ No newline at end of file diff --git a/src/views/enterpriseArchives/componets/cardBox.vue b/src/views/enterpriseArchives/componets/cardBox.vue new file mode 100644 index 0000000..99bac18 --- /dev/null +++ b/src/views/enterpriseArchives/componets/cardBox.vue @@ -0,0 +1,224 @@ + + + \ No newline at end of file diff --git a/src/views/enterpriseArchives/index.vue b/src/views/enterpriseArchives/index.vue index d7c672d..a73fb38 100644 --- a/src/views/enterpriseArchives/index.vue +++ b/src/views/enterpriseArchives/index.vue @@ -1,266 +1,295 @@ \ No newline at end of file diff --git a/src/views/head.vue b/src/views/head.vue index f176be4..b40e91d 100644 --- a/src/views/head.vue +++ b/src/views/head.vue @@ -2,7 +2,10 @@
- +
镇海平安企业（园区）
安商惠企
+ 企业档案 +
实时预警 @@ -33,15 +40,14 @@ >要素资源
- 企业档案 -
系统管理
+
@@ -76,6 +82,8 @@ export default { ? sessionStorage.getItem("activeIndex") : "1"; }, + computed: { + }, methods: { handleSelect(key) { sessionStorage.setItem("activeIndex", key); @@ -95,6 +103,23 @@ export default { // 跳转到登录页 this.$router.push("/login"); }, + get_time() { + let date = new Date(); + let sign = ":"; + let hour = date.getHours(); // 时 + let minutes = date.getMinutes(); // 分 + let seconds = date.getSeconds(); //秒 + if (hour >= 0 && hour <= 9) { + hour = "0" + hour; + } + if (minutes >= 0 && minutes <= 9) { + minutes = "0" + minutes; + } + if (seconds >= 0 && seconds <= 9) { + seconds = "0" + seconds; + } + return hour + sign + minutes + sign + seconds; + }, }, }; @@ -138,7 +163,20 @@ export default { font-weight: 400; margin-right: 30px; } - + .time_box { + width: 8.5vw; + height: 6vh; + border: 0.1px solid #33cccc; + .time_item { + width: 8.5vw; + height: 3.5vh; + text-align: center; + line-height: 3.5vh; + color: #37FDC7 ; + font-size: 24px; + font-weight: 600; + } + } .jingGuan { position: absolute; right: 30px; diff --git a/src/views/realtimeWarning/index.vue b/src/views/realtimeWarning/index.vue index 0c13f43..f831a54 100644 --- a/src/views/realtimeWarning/index.vue +++ b/src/views/realtimeWarning/index.vue @@ -23,6 +23,7 @@ ( {{ total }} ) +
@@ -37,6 +38,7 @@
+
-
{{ item.companyName }}
+
+
+
{{ item.companyName }}
+
+