From a528da8558e414fa30ba0c01ef9e7603eb870139 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 08 Nov 2024 12:31:45 +0800
Subject: [PATCH] Merge branch 'main' of http://139.196.74.78:10010/r/zhyq/bigScreen
---
src/views/rt/components/box/dataContent.vue | 57 +++++---------
src/views/rs/components/box/dataContent.vue | 58 ++++++--------
src/views/rs/components/leftContainer.vue | 7 +
src/views/rs/components/rightContainer.vue | 6
src/views/space/components/box/dataContent.vue | 67 ++++++----------
5 files changed, 79 insertions(+), 116 deletions(-)
diff --git a/src/views/rs/components/box/dataContent.vue b/src/views/rs/components/box/dataContent.vue
index 4abf607..f806339 100644
--- a/src/views/rs/components/box/dataContent.vue
+++ b/src/views/rs/components/box/dataContent.vue
@@ -106,34 +106,31 @@
<public-content>
<template #content>
<div class="search-box">
- <div class="search-form">
- <el-form :inline="true" :model="riskSource" class="demo-form-inline">
- <el-form-item label="" class="form-item-input">
- <el-input v-model="riskSource.name" placeholder="请输入风险源" clearable style="width: 120px" />
- </el-form-item>
- <el-form-item class="transparent-select" label="">
- <el-select v-model="riskSource.riskLevel" placeholder="请选择等级" clearable style="width: 120px">
- <el-option label="一般" value="1" />
- <el-option label="较大" value="2" />
- </el-select>
- </el-form-item>
- <el-form-item class="search-btn">
- <el-button type="primary" @click="onSubmit">查询</el-button>
- <el-button type="primary" @click="clearBtn">重置</el-button>
- </el-form-item>
- </el-form>
- <el-table :data="tableData" style="width: 100%" :header-cell-style="headerCellStyle"
- :cell-style="tableCellStyle" v-loading="loading"
- element-loading-background="rgba(122, 122, 122, 0.1)">
- <el-table-column prop="firmName" label="单位名称" />
- <el-table-column prop="riskLevelName" label="等级" width="100" />
- <el-table-column show-overflow-tooltip fixed prop="name" label="风险源" />
- </el-table>
- </div>
- <div class="el-page">
- <el-pagination background layout="prev, pager, next" :page-size="pages.pageSize" :total="pages.total"
- @size-change="handleSizeChange" @current-change="handleCurrentChange" />
- </div>
+ <el-form :inline="true" :model="riskSource" class="demo-form-inline">
+ <el-form-item label="" class="form-item-input">
+ <el-input v-model="riskSource.name" placeholder="请输入风险源" clearable style="width: 120px" />
+ </el-form-item>
+ <el-form-item class="transparent-select" label="">
+ <el-select v-model="riskSource.riskLevel" placeholder="请选择等级" clearable style="width: 120px">
+ <el-option label="一般" value="1" />
+ <el-option label="较大" value="2" />
+ </el-select>
+ </el-form-item>
+ <el-form-item class="search-btn">
+ <el-button type="primary" @click="onSubmit">查询</el-button>
+ <el-button type="primary" @click="clearBtn">重置</el-button>
+ </el-form-item>
+ </el-form>
+ <el-table :data="tableData" style="width: 100%" :header-cell-style="headerCellStyle"
+ :cell-style="tableCellStyle" v-loading="loading" element-loading-background="rgba(122, 122, 122, 0.1)">
+ <el-table-column prop="firmName" label="单位名称" />
+ <el-table-column prop="riskLevelName" label="等级" width="100" />
+ <el-table-column show-overflow-tooltip fixed prop="name" label="风险源" />
+ </el-table>
+ </div>
+ <div class="el-page">
+ <el-pagination background layout="prev, pager, next" :page-size="pages.pageSize" :total="pages.total"
+ @size-change="handleSizeChange" @current-change="handleCurrentChange" />
</div>
</template>
</public-content>
@@ -145,15 +142,10 @@
}
.search-box {
-
::v-deep .el-table__body-wrapper {
background-color: #152851;
}
}
-
-.search-form {}
-
-
/* 当表格没有数据时，修改表格的背景颜色 */
.el-table--empty .el-table__body {
diff --git a/src/views/rs/components/leftContainer.vue b/src/views/rs/components/leftContainer.vue
index f4cc54c..a972fa4 100644
--- a/src/views/rs/components/leftContainer.vue
+++ b/src/views/rs/components/leftContainer.vue
@@ -51,4 +51,9 @@
</div>
</template>
-<style lang="scss" scoped></style>
\ No newline at end of file
+<style lang="scss" scoped>
+.content-box {
+ margin-top: 20px;
+ position: absolute;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/rs/components/rightContainer.vue b/src/views/rs/components/rightContainer.vue
index 3037fd7..368a022 100644
--- a/src/views/rs/components/rightContainer.vue
+++ b/src/views/rs/components/rightContainer.vue
@@ -24,7 +24,7 @@
</template>
</title-box>
<div class="content-box">
- <fire-source></fire-source>
+ <fire-source></fire-source>
</div>
</div>
@@ -35,7 +35,7 @@
</template>
</title-box>
<div class="content-box">
- <fire-trend></fire-trend>
+ <fire-trend></fire-trend>
</div>
</div>
@@ -46,7 +46,7 @@
</template>
</title-box>
<div class="content-box">
- <occur-statistics></occur-statistics>
+ <occur-statistics></occur-statistics>
</div>
</div>
</div>
diff --git a/src/views/rt/components/box/dataContent.vue b/src/views/rt/components/box/dataContent.vue
index 2e7928c..1dfeb7c 100644
--- a/src/views/rt/components/box/dataContent.vue
+++ b/src/views/rt/components/box/dataContent.vue
@@ -30,7 +30,7 @@
return { background: "#152851", color: "#fff" };
};
// 表格表头样式
-const headerCellStyle = ({}) => {
+const headerCellStyle = ({ }) => {
return {
background: "#152851",
color: "#fff",
@@ -39,14 +39,14 @@
// 搜索条件
const formInline = reactive({
perInCha: "",
- type:''
+ type: ''
});
// 提交查询
const onSubmit = () => {
pages.page = 1
- pages.pageSize=13
- pages.total= 0
+ pages.pageSize = 13
+ pages.total = 0
console.log("submit!");
getLists(formInline);
};
@@ -62,12 +62,12 @@
getLists(formInline);
}
// 重置条件
-const clearBtn = ()=>{
+const clearBtn = () => {
formInline.perInCha = ''
formInline.type = ''
pages.page = 1
- pages.pageSize=13
- pages.total= 0
+ pages.pageSize = 13
+ pages.total = 0
getLists(formInline);
}
@@ -80,7 +80,7 @@
.then((res) => {
const data = res.data.data;
data.records.forEach((element) => {
- if (element.type==1) {
+ if (element.type == 1) {
element.ownership = "园区";
} else {
element.ownership = "企业";
@@ -103,20 +103,10 @@
<div>
<el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-form-item label="姓名">
- <el-input
- v-model="formInline.perInCha"
- placeholder="请输入姓名"
- clearable
- style="width: 120px"
- />
+ <el-input v-model="formInline.perInCha" placeholder="请输入姓名" clearable style="width: 120px" />
</el-form-item>
<el-form-item label="归属">
- <el-select
- v-model="formInline.type"
- placeholder="请选择"
- clearable
- style="width: 120px"
- >
+ <el-select v-model="formInline.type" placeholder="请选择" clearable style="width: 120px">
<el-option label="园区" value="1" />
<el-option label="企业" value="2" />
</el-select>
@@ -126,27 +116,16 @@
<el-button type="" @click="clearBtn">重置</el-button>
</el-form-item>
</el-form>
- <el-table
- :data="tableData"
- style="width: 100%"
- :header-cell-style="headerCellStyle"
- :cell-style="tableCellStyle"
- v-loading="loading"
- >
+ <el-table :data="tableData" style="width: 100%" :header-cell-style="headerCellStyle" :cell-style="tableCellStyle"
+ v-loading="loading">
<el-table-column fixed prop="perInCha" label="责任人姓名" />
<el-table-column prop="perInChaPho" label="联系电话" />
<!-- <el-table-column prop="firmName" label="单位名称" /> -->
<el-table-column prop="ownership" label="归属" width="100" />
</el-table>
<div class="el-page">
- <el-pagination
- background
- layout="prev, pager, next"
- :page-size="pages.pageSize"
- :total="pages.total"
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- />
+ <el-pagination background layout="prev, pager, next" :page-size="pages.pageSize" :total="pages.total"
+ @size-change="handleSizeChange" @current-change="handleCurrentChange" />
</div>
</div>
</template>
@@ -154,13 +133,18 @@
</template>
<style lang="scss" scoped>
+::v-deep .el-table__body-wrapper {
+ background-color: #152851;
+}
+
.el-form-item__label {
color: #fff !important;
}
/* 当表格没有数据时，修改表格的背景颜色 */
.el-table--empty .el-table__body {
- background-color: #19284e !important; /* 你想要的背景颜色 */
+ background-color: rgba(135, 158, 199, 0.3) !important;
+ /* 你想要的背景颜色 */
}
.el-page {
@@ -168,6 +152,7 @@
width: 100%;
display: flex;
align-items: center;
+ justify-content: center;
// margin-bottom:10px;
}
</style>
diff --git a/src/views/space/components/box/dataContent.vue b/src/views/space/components/box/dataContent.vue
index 36a1b0a..e8a71c9 100644
--- a/src/views/space/components/box/dataContent.vue
+++ b/src/views/space/components/box/dataContent.vue
@@ -64,7 +64,7 @@
return { background: "#152851", color: "#fff" };
};
// 表格表头样式
-const headerCellStyle = ({}) => {
+const headerCellStyle = ({ }) => {
return {
background: "#152851",
color: "#fff",
@@ -138,63 +138,41 @@
// 行点击
function rowClick(row) {
- // 读取定位飞
+ // 读取定位飞
}
// 查看详情
-function goDetail(row) {}
+function goDetail(row) { }
</script>
<template>
<public-content>
<template #content>
- <div>
+ <div class="search-box">
<el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-form-item label="名称">
- <el-input
- v-model="formInline.name"
- placeholder="请输入名称"
- clearable
- style="width: 350px"
- />
+ <el-input v-model="formInline.name" placeholder="请输入名称" clearable style="width: 350px" />
</el-form-item>
<el-form-item label="类型">
- <el-select
- v-model="formInline.type"
- placeholder="请选择"
- clearable
- style="width: 120px"
- >
- <el-option
- v-for="item in opertionData"
- :label="item.dictValue"
- :value="item.dictKey"
- />
+ <el-select v-model="formInline.type" placeholder="请选择" clearable style="width: 120px">
+ <el-option v-for="item in opertionData" :label="item.dictValue" :value="item.dictKey" />
</el-select>
</el-form-item>
<el-form-item>
- <el-button siz="default" type="primary" @click="onSubmit"
- >查询</el-button
- >
+ <el-button siz="default" type="primary" @click="onSubmit">查询</el-button>
<el-button siz="default" type="" @click="clearBtn">重置</el-button>
</el-form-item>
</el-form>
- <el-table
- :data="tableData"
- style="width: 100%"
- :header-cell-style="headerCellStyle"
- :cell-style="tableCellStyle"
- v-loading="loading"
- >
+ <el-table :data="tableData" style="width: 100%" :header-cell-style="headerCellStyle" :cell-style="tableCellStyle"
+ v-loading="loading">
<el-table-column fixed prop="name" label="名称" />
<el-table-column prop="emergencySpaceType" label="类型" width="70" />
<el-table-column prop="mainFuncName" label="作用" width="60" />
<el-table-column width="60" label="操作" align="center">
<template #default="scope">
- <el-button link type="primary" size="small" :disabled="scope.row.lng==''"
- @click="rowClick(scope.row)">
+ <el-button link type="primary" size="small" :disabled="scope.row.lng == ''" @click="rowClick(scope.row)">
定位
- </el-button>
+ </el-button>
<!-- <el-button link type="primary" size="small" @click="goDetail">
<i class="el-icon-document" style="color: #66b1ff"></i>详情
</el-button> -->
@@ -202,14 +180,8 @@
</el-table-column>
</el-table>
<div class="el-page">
- <el-pagination
- background
- layout="prev, pager, next"
- :page-size="pages.pageSize"
- :total="pages.total"
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- />
+ <el-pagination background layout="prev, pager, next" :page-size="pages.pageSize" :total="pages.total"
+ @size-change="handleSizeChange" @current-change="handleCurrentChange" />
</div>
</div>
</template>
@@ -221,9 +193,17 @@
color: #fff !important;
}
+
+.search-box {
+ ::v-deep .el-table__body-wrapper {
+ background-color: #152851;
+ }
+}
+
/* 当表格没有数据时，修改表格的背景颜色 */
.el-table--empty .el-table__body {
- background-color: #19284e !important; /* 你想要的背景颜色 */
+ background-color: rgba(135, 158, 199, 0.3);
+ /* 你想要的背景颜色 */
}
.el-page {
@@ -231,6 +211,7 @@
width: 100%;
display: flex;
align-items: center;
+ justify-content: center;
// margin-bottom:10px;
}
</style>
--
Gitblit v1.9.3