From 2ecdf3e85d212164276770266a757e2a201a3d0f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 30 Oct 2024 11:18:32 +0800
Subject: [PATCH] Merge branch 'main' of http://139.196.74.78:10010/r/zhyq/bigScreen
---
src/views/survey/components/box/dataContent.vue | 35 +++++-
src/views/survey/components/box/fireSource.vue | 145 +++++++++++++++++++++++++++-
src/views/survey/components/box/fireTrend.vue | 73 +++++++++++++-
src/views/survey/components/leftContainer.vue | 2
src/views/monitoring/components/leftContainer.vue | 2
src/views/survey/components/rightContainer.vue | 25 ++--
src/views/pac/components/leftContainer.vue | 2
7 files changed, 251 insertions(+), 33 deletions(-)
diff --git a/src/views/monitoring/components/leftContainer.vue b/src/views/monitoring/components/leftContainer.vue
index 0781c33..bd0f1e8 100644
--- a/src/views/monitoring/components/leftContainer.vue
+++ b/src/views/monitoring/components/leftContainer.vue
@@ -19,7 +19,7 @@
<div class="data box">
<title-box>
<template #titleName>
- 数据概览
+ 数据概览3
</template>
</title-box>
<data-content></data-content>
diff --git a/src/views/pac/components/leftContainer.vue b/src/views/pac/components/leftContainer.vue
index 0781c33..714a615 100644
--- a/src/views/pac/components/leftContainer.vue
+++ b/src/views/pac/components/leftContainer.vue
@@ -19,7 +19,7 @@
<div class="data box">
<title-box>
<template #titleName>
- 数据概览
+ 数据概览2
</template>
</title-box>
<data-content></data-content>
diff --git a/src/views/survey/components/box/dataContent.vue b/src/views/survey/components/box/dataContent.vue
index 7152a88..be7833e 100644
--- a/src/views/survey/components/box/dataContent.vue
+++ b/src/views/survey/components/box/dataContent.vue
@@ -13,13 +13,34 @@
</script>
<template>
- <public-content>
- <template #content>
- <div>
-
+ <!-- <public-content>
+ <template #content> -->
+ <div class="data-content">
+ <div v-for="item in 5">
+ <div class="data-content-item">
+ <div> 测试企业111111</div>
+ <el-button size="small" type="primary">化工企业</el-button>
</div>
- </template>
- </public-content>
+
+ </div>
+ </div>
+ <!-- </template>
+ </public-content> -->
</template>
-<style lang="scss" scoped></style>
\ No newline at end of file
+<style lang="scss" scoped>
+.data-content {
+ color: #fff;
+
+}
+
+.data-content-item {
+ display: flex;
+ margin: 2px 2px;
+ padding: 5px 0;
+ background-color: #747bff;
+ justify-content: space-between;
+ // 超过高度自动显示滚动条
+ overflow-y: auto;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/survey/components/box/fireSource.vue b/src/views/survey/components/box/fireSource.vue
index 7152a88..fc313a4 100644
--- a/src/views/survey/components/box/fireSource.vue
+++ b/src/views/survey/components/box/fireSource.vue
@@ -13,13 +13,146 @@
</script>
<template>
- <public-content>
- <template #content>
- <div>
+ <!-- <public-content>
+ <template #content> -->
+ <div class="box-content-box">
+ <div class="box-content">
+ <div>
+ <div class="box-content-img">
+ <img src="../../../../../public/images/YX.png" alt="">
+ </div>
</div>
- </template>
- </public-content>
+ <div>
+ <div class="box-content-text">
+ 吉水县地处江西省中部，赣江中游。地处东经114°38′至115°36′、北纬25°52′至27°33′之间，横跨赣江两岸，东南与永丰县接壤，北与峡江县相连，西南与吉安市、吉安县交界。县城文峰镇，西南距吉安市23公里，北距省会南昌196公里，东至永丰县城57公里，西北至峡江县城75公里，京九铁路、105国道、赣江水道均从县城经过，建设中的赣粤高速公路从县城西部穿越，其挂线跨越赣江，从县城北部进入老城区。江西吉水工业园区城西工业园位于吉水县老城区西南约2km处，吉水县城新区西部，东临赣江，北靠金滩镇，西达赣粤高速公路挂线，赣江大桥联系新区东部与西部。吉水县工业园规划为“一区三园”，分别为城西工业园、黄桥工业园、八都工业园。工业园总面积达854.25公顷（12813.7亩），其中，八都工业园17.19公顷、城西工业园735.68公顷、黄桥工业园101.38公顷。城西工业园分两期：城西工业园Ⅰ规模为218.47公顷，其四至范围为：东至赣江，西至白水路，南至黄金大道，北至金滩镇金滩村。城西工业园Ⅱ规模为517.21公顷，其四至范围为：东至金滩镇白鹭村-双元村，西至金滩镇古塘村-前进村，南至赣粤高速连接线，北至金滩镇前进村。江西吉水工业园区化工集中区位于江西吉水工业园区城西工业园Ⅱ内
+ </div>
+ </div>
+ </div>
+
+ <div class="container">
+ <div class="box-content-sj" v-for="(item, index) in 6" :key="index">
+ <img src="../../../../../public/images/YX.png" alt="">
+ <div>
+ <div class="box-content-ss">
+ <div>
+ <div class="box-content-text-title">
+ <span class="box-content-text-title-span">2999</span>
+ </div>
+ </div>
+ <div>
+ <div class="box-content-text-content">
+ <span class="box-content-text-content-span">企业园区</span>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="content-qy-info">
+ <div class="box-content-title">
+ <img src="../../../../../public/images/YX.png" alt="">
+ <div class="box-content-title-text">
+ <span class="box-content-title-text-span">企业</span>
+ </div>
+ </div>
+
+ <div class="box-content-title">
+ <img src="../../../../../public/images/YX.png" alt="">
+ <div class="box-content-title-text">
+ <span class="box-content-title-text-span">分区</span>
+ </div>
+ </div>
+
+ <div class="box-content-title">
+ <img src="../../../../../public/images/YX.png" alt="">
+ <div class="box-content-title-text">
+ <span class="box-content-title-text-span">图层</span>
+ </div>
+ </div>
+
+
+
+
+ </div>
+
+
+ </div>
+ <!-- </template>
+ </public-content> -->
</template>
-<style lang="scss" scoped></style>
\ No newline at end of file
+<style lang="scss" scoped>
+.box-content-box {
+ color: #fff;
+}
+
+.box-content {
+ display: flex;
+ justify-content: space-between;
+
+}
+
+.content-qy-info {
+ display: flex;
+ justify-content: space-between;
+ text-align: center;
+ margin-top: 15px;
+}
+
+.box-content-img img {
+ margin: 5px;
+ width: 120px;
+ /* 宽度可以根据实际情况调整 */
+ height: 120px;
+}
+
+.box-content-text {
+ padding-left: 5px;
+ // width: 60%;
+ /* 宽度可以根据实际情况调整 */
+ height: 130px;
+ /* 高度可以根据实际情况调整 */
+ overflow: hidden;
+}
+
+.container {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 5px;
+}
+
+.box-content-sj {
+ flex: 1 1 31%;
+ /* 每个盒子占据大约31%的宽度，留出一些空间用于间距 */
+ min-width: 100px;
+ /* 最小宽度，防止在非常小的屏幕上变得太窄 */
+ box-sizing: border-box;
+ padding: 5px;
+ // border: 1px solid #ccc;
+ display: flex;
+ // 设置高度
+ align-items: center;
+}
+
+.box-content-sj img {
+ max-width: 60%;
+ height: 60px;
+}
+
+.box-content-ss {
+ margin: 0px 0px 0px 10px;
+}
+
+.box-content-text-title,
+.box-content-text-content {
+ margin-top: 5px;
+}
+
+.box-content-text-title-span,
+.box-content-text-content-span {
+ font-weight: bold;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/survey/components/box/fireTrend.vue b/src/views/survey/components/box/fireTrend.vue
index 7152a88..fa4d5b3 100644
--- a/src/views/survey/components/box/fireTrend.vue
+++ b/src/views/survey/components/box/fireTrend.vue
@@ -13,13 +13,74 @@
</script>
<template>
- <public-content>
- <template #content>
- <div>
+ <!-- <public-content>
+ <template #content> -->
+ <div class="box-content">
+
+ <div>
+ <div class="search-container">
+ <input type="text" v-model="searchQuery" placeholder="请输入企业名称" class="search-input"
+ @keyup.enter="handleSearch" />
+ <button class="search-button" @click="handleSearch">搜索</button>
+ </div>
+ </div>
+
+ <div>
+ <div v-for="item in 5">
+ <div class="data-content-item">
+ <div> 测试企业111111</div>
+ <el-button size="small" type="primary">进入企业</el-button>
+ </div>
</div>
- </template>
- </public-content>
+ </div>
+ </div>
+ <!-- </template>
+ </public-content> -->
</template>
-<style lang="scss" scoped></style>
\ No newline at end of file
+<style lang="scss" scoped>
+.box-content {
+ color: #fff;
+}
+
+.search-container {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin: 10px 0px;
+}
+
+.search-input {
+ width: 79%;
+ /* 可以根据需要调整宽度 */
+ padding: 10px;
+ border: 1px solid #ccc;
+ border-radius: 4px 0 0 4px;
+ outline: none;
+}
+
+.search-button {
+ padding: 10px 20px;
+ border: 1px solid #ccc;
+ border-radius: 0 4px 4px 0;
+ background-color: #007bff;
+ color: white;
+ cursor: pointer;
+ transition: background-color 0.3s;
+}
+
+.search-button:hover {
+ background-color: #0056b3;
+}
+
+.data-content-item {
+ display: flex;
+ margin: 2px 2px;
+ padding: 5px 0;
+ background-color: #747bff;
+ justify-content: space-between;
+ // 超过高度自动显示滚动条
+ overflow-y: auto;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/survey/components/leftContainer.vue b/src/views/survey/components/leftContainer.vue
index 0781c33..56246b7 100644
--- a/src/views/survey/components/leftContainer.vue
+++ b/src/views/survey/components/leftContainer.vue
@@ -19,7 +19,7 @@
<div class="data box">
<title-box>
<template #titleName>
- 数据概览
+ 数据概览1
</template>
</title-box>
<data-content></data-content>
diff --git a/src/views/survey/components/rightContainer.vue b/src/views/survey/components/rightContainer.vue
index 67eb54e..53dad19 100644
--- a/src/views/survey/components/rightContainer.vue
+++ b/src/views/survey/components/rightContainer.vue
@@ -20,29 +20,32 @@
<div class="fire-source box">
<title-box>
<template #titleName>
- 火警事件来源
+ 园区简介
</template>
</title-box>
<fire-source></fire-source>
</div>
- <div class="occur-statistics box">
- <title-box>
- <template #titleName>
- 易发区统计
- </template>
- </title-box>
- <fire-trend></fire-trend>
- </div>
-
- <div class="fire-trend box">
+ <!-- <div class="fire-trend box">
<title-box>
<template #titleName>
火警上报趋势
</template>
</title-box>
<occur-statistics></occur-statistics>
+ </div> -->
+
+
+ <div class="occur-statistics box">
+ <title-box>
+ <template #titleName>
+ 企业名录
+ </template>
+ </title-box>
+ <fire-trend></fire-trend>
</div>
+
+
</div>
</template>
--
Gitblit v1.9.3