From d0ae76adc2c1b9601b370a0ec8bb989eabc07030 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Mon, 11 Nov 2024 15:51:14 +0800
Subject: [PATCH] 企业详情优化
---
src/views/survey/components/box/fireSource.vue | 1
src/views/rt/components/box/dataContent.vue | 58 ++++++++------
src/views/layout/index.vue | 5 +
src/views/companyInfo/components/box/fireSource.vue | 130 ++++++++++++++++---------------
4 files changed, 106 insertions(+), 88 deletions(-)
diff --git a/src/views/companyInfo/components/box/fireSource.vue b/src/views/companyInfo/components/box/fireSource.vue
index 1005209..8f5e43b 100644
--- a/src/views/companyInfo/components/box/fireSource.vue
+++ b/src/views/companyInfo/components/box/fireSource.vue
@@ -8,6 +8,59 @@
*
* Copyright (c) 2023 by ${git_name_email}, All Rights Reserved.
-->
+
+<template>
+ <div class="data-content w100 h100">
+
+ <div class="clearfix">
+ <div class="content-firmIntro">
+ <el-image :src="data.companyInfo.imageUrls" :zoom-rate="1.2" :max-scale="7" :min-scale="0.2"
+ :preview-src-list="[data.companyInfo.imageUrls]" :initial-index="4" fit="cover">
+ <template #error>
+ <div class="image-slot">
+ <el-icon><icon-picture /></el-icon>
+ </div>
+ </template>
+ </el-image>
+ <span> {{ data.companyInfo.firmIntro }} </span>
+ </div>
+ </div>
+
+ <div class="company-info">
+ <div class="company-info-item" v-for="item in companyInfoList" :key="item.id">
+ <el-row>
+ <el-col :span="8">
+ <div class="company-info-title">{{ item.title }}</div>
+ </el-col>
+ <el-col :span="16">
+ <div class="company-info-content">{{ item.content }}</div>
+ </el-col>
+ </el-row>
+ </div>
+ </div>
+
+ <div class="company-info">
+ <div class="" style="text-align: center;margin-top: 10px;">救援队伍</div>
+ <div class="company-info-item" v-for="item in rescueTeamList" :key="item.id">
+ <el-row>
+ <el-col :span="8">
+ <div class="company-info-title">{{ item.title }}</div>
+ </el-col>
+ <el-col :span="16">
+ <div class="company-info-content">{{ item.content }}</div>
+ </el-col>
+ </el-row>
+ </div>
+ </div>
+
+ <!-- <div class="company-info-image">
+ <div class="" style="text-align: center;margin-top: 10px;">企业图片</div>
+ </div> -->
+
+
+ </div>
+</template>
+
<script setup>
import publicContent from './publicContent.vue'
import { getAssetsFile } from 'utils/utils'
@@ -96,56 +149,7 @@
</script>
-<template>
- <div class="data-content w100 h100">
- <div class="content-firmIntro">
- <span> {{ data.companyInfo.firmIntro }}</span>
- </div>
-
- <div class="company-info">
- <div class="company-info-item" v-for="item in companyInfoList" :key="item.id">
- <el-row>
- <el-col :span="8">
- <div class="company-info-title">{{ item.title }}</div>
- </el-col>
- <el-col :span="16">
- <div class="company-info-content">{{ item.content }}</div>
- </el-col>
- </el-row>
- </div>
- </div>
-
- <div class="company-info">
- <div class="" style="text-align: center;margin-top: 10px;">救援队伍</div>
- <div class="company-info-item" v-for="item in rescueTeamList" :key="item.id">
- <el-row>
- <el-col :span="8">
- <div class="company-info-title">{{ item.title }}</div>
- </el-col>
- <el-col :span="16">
- <div class="company-info-content">{{ item.content }}</div>
- </el-col>
- </el-row>
- </div>
- </div>
-
- <div class="company-info-image">
- <div class="" style="text-align: center;margin-top: 10px;">企业图片</div>
- <!-- <img :src="data.companyInfo.image_urls" alt=""> -->
- <el-image style="width: 100px; height: 100px" :src="data.companyInfo.image_urls" :zoom-rate="1.2" :max-scale="7"
- :min-scale="0.2" :preview-src-list="[data.companyInfo.image_urls]" :initial-index="4" fit="cover">
- <template #error>
- <div class="image-slot">
- <el-icon><icon-picture /></el-icon>
- </div>
- </template>
- </el-image>
- </div>
-
-
- </div>
-</template>
<style lang="scss" scoped>
.data-content {
@@ -153,11 +157,25 @@
color: #fff;
}
+.clearfix::after {
+ content: '';
+ display: block;
+ clear: both;
+}
+
.content-firmIntro {
height: 300px;
overflow-x: hidden;
// 隐藏滚动条
scrollbar-width: none;
+}
+
+.content-firmIntro .el-image {
+ float: left;
+ margin-right: 10px;
+ margin-top: 5px;
+ width: 90px;
+ height: 90px;
}
.content-firmIntro span {
@@ -191,19 +209,5 @@
.company-info-jydw div {
text-align: center;
margin-top: 10px;
-}
-
-.company-info-jydw ul li {
- // text-align: center;
- // margin-top: 10px;
-}
-
-.company-info-image {
- margin-top: 20px;
- width: 100%;
- height: 200px;
- // background-color: pink;
- border-top: #dfdcdc 2px solid;
- text-align: center;
}
</style>
\ No newline at end of file
diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue
index a8ff915..2e6e3dc 100644
--- a/src/views/layout/index.vue
+++ b/src/views/layout/index.vue
@@ -81,6 +81,11 @@
const showContent = ref(false)
const showSubLayout = ref(false)
const showSinglePage = ref(false)
+
+// onMounted(() => {
+// store.setLoadSub(false)
+// }),
+
// 监听createB的变化
watch(
[
diff --git a/src/views/rt/components/box/dataContent.vue b/src/views/rt/components/box/dataContent.vue
index eb93562..c42cebe 100644
--- a/src/views/rt/components/box/dataContent.vue
+++ b/src/views/rt/components/box/dataContent.vue
@@ -21,34 +21,36 @@
let currentIndex = ref(0)
// 园区 企业
const tilteList = ref([
- { label: "吉水化工园区", value: "0", id: "1" }
+ { label: "吉水化工园区", value: "0", id: "1" },
+ { label: "吉水化工园区企业", value: "0", id: "2" }
+
]);
const pages = {
page: 1,
- pageSize: 13,
+ pageSize: 100,
total: 0,
};
onMounted(() => {
- getLists();
- getCompanyPages();
+ getLists(formInline);
+ // getCompanyPages();
});
-function getCompanyPages(param = {}) {
- param.current = pages.page;
- param.size = pages.pageSize;
- getPage(param).then(res => {
- let companyList = res.data.data.records
- companyList.forEach(item => {
- tilteList.value.push({
- label: item.name,
- value: item.id,
- id: item.id
- })
- })
- }).catch(err => {
- })
-}
+// function getCompanyPages(param = {}) {
+// param.current = pages.page;
+// param.size = pages.pageSize;
+// getPage(param).then(res => {
+// let companyList = res.data.data.records
+// companyList.forEach(item => {
+// tilteList.value.push({
+// label: item.name,
+// value: item.id,
+// id: item.id
+// })
+// })
+// }).catch(err => {
+// })
+// }
function handleClick(item, index) {
currentIndex.value = index
@@ -56,10 +58,8 @@
pages.pageSize = 1000
pages.total = 0
if (item.id == 1) {
- formInline.firmId = ''
formInline.type = 1
} else {
- formInline.firmId = item.id
formInline.type = 2
}
getLists(formInline);
@@ -78,7 +78,7 @@
// 搜索条件
const formInline = reactive({
perInCha: "",
- type: ''
+ type: '1'
});
// 提交查询
@@ -167,12 +167,20 @@
<div class="page_box">
- <el-table :data="tableData" style="width: 100%" :header-cell-style="headerCellStyle"
+ <el-table v-if="formInline.type == 1" :data="tableData" style="width: 100%" :header-cell-style="headerCellStyle"
:cell-style="tableCellStyle">
- <el-table-column fixed prop="perInCha" label="责任人姓名" />
- <el-table-column prop="perInChaPho" label="联系电话" />
<el-table-column prop="teamName" label="救援队伍组名称" />
<el-table-column prop="teamJob" label="救援队伍组职务" />
+ <el-table-column prop="perInCha" label="责任人姓名" />
+ <el-table-column prop="job" label="园区职务" />
+ <el-table-column prop="perInChaPho" label="联系电话" />
+ </el-table>
+
+ <el-table v-else :data="tableData" style="width: 100%" :header-cell-style="headerCellStyle"
+ :cell-style="tableCellStyle">
+ <el-table-column prop="firmName" label="企业名称" />
+ <el-table-column prop="perInCha" label="责任人姓名" />
+ <el-table-column prop="perInChaPho" label="联系电话" />
</el-table>
</div>
diff --git a/src/views/survey/components/box/fireSource.vue b/src/views/survey/components/box/fireSource.vue
index 2acebd0..6926730 100644
--- a/src/views/survey/components/box/fireSource.vue
+++ b/src/views/survey/components/box/fireSource.vue
@@ -138,6 +138,7 @@
}
.box-content-img {
+
height: 380px;
line-height: 28px;
// 隐藏滚动条
--
Gitblit v1.9.3