From 54973736683025ae865a41a21c4d13f88c721760 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 15 Nov 2024 14:46:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
src/views/supplies/components/box/dataContent.vue | 90 ++++++++++++++++++++++----------------------
src/styles/element/index.scss | 20 ++++++----
2 files changed, 57 insertions(+), 53 deletions(-)
diff --git a/src/styles/element/index.scss b/src/styles/element/index.scss
index 0cb3f7d..6f474c3 100644
--- a/src/styles/element/index.scss
+++ b/src/styles/element/index.scss
@@ -10,7 +10,7 @@
font-size: 18px;
tr {
- // height: 38px;
+ height: 38px;
background: rgba(35, 53, 92, 0.8) !important;
box-sizing: border-box;
@@ -28,13 +28,13 @@
.el-table__body-wrapper {
font-size: 16px;
- table {
- border-collapse: separate !important;
- // border-spacing: 0 10px !important;
- }
+ // table {
+ // border-collapse: separate !important;
+ // border-spacing: 0 0px !important;
+ // }
tr {
- // height: 38px;
+ height: 38px;
background: rgba(36, 57, 110, 0.2);
box-sizing: border-box;
cursor: pointer;
@@ -49,19 +49,23 @@
td {
padding: 0;
height: 38px;
- // line-height: 38px;
+ line-height: 38px;
color: #D4E8F8;
// border-top: 1px solid rgba(110, 135, 197, 0.32);
// border-bottom: 1px solid rgba(110, 135, 197, 0.32);
+ border-color: rgba(110, 135, 197, 0.32);
box-sizing: border-box;
}
td:first-child {
// border-left: 1px solid rgba(110, 135, 197, 0.32);
+ border-color: rgba(110, 135, 197, 0.32);
}
td:last-child {
// border-right: 1px solid rgba(110, 135, 197, 0.32);
+
+ border-color: rgba(110, 135, 197, 0.32);
}
}
}
@@ -73,4 +77,4 @@
color: #D4E8F8;
}
}
-}
\ No newline at end of file
+}
diff --git a/src/views/supplies/components/box/dataContent.vue b/src/views/supplies/components/box/dataContent.vue
index 23201d3..b31b758 100644
--- a/src/views/supplies/components/box/dataContent.vue
+++ b/src/views/supplies/components/box/dataContent.vue
@@ -41,32 +41,32 @@
</template>
<script setup>
-import publicContent from "./publicContent.vue";
-import { getList, getCompanyList } from "@/api/emergencySupplies/emergencySupplies";
+import publicContent from "./publicContent.vue"
+import { getList, getCompanyList } from "@/api/emergencySupplies/emergencySupplies"
import { getPage } from '@/api/indParkInfo'
-import { reactive, ref, onMounted } from "vue";
-import { ElScrollbar } from 'element-plus';
+import { reactive, ref, onMounted } from "vue"
+import { ElScrollbar } from 'element-plus'
-const loading = ref(false);
+const loading = ref(false)
-const tableData = ref([]);
+const tableData = ref([])
const pages = {
page: 1,
pageSize: 1000,
total: 0,
-};
+}
let currentIndex = ref(0)
// 园区 企业
const tilteList = ref([
{ label: "吉水化工园区", value: "0", id: "1" }
-]);
+])
onMounted(() => {
- getLists(formInline);
+ getLists(formInline)
getCompanyPages()
-});
+})
// const objectSpanMethod = ({ row, column, rowIndex, columnIndex }) => {
// if (columnIndex === 0) {
@@ -84,18 +84,18 @@
// }
// }
-const scrollbarRef = ref(null);
+const scrollbarRef = ref(null)
// 搜索条件
const formInline = reactive({
firmId: '',
ownership: 1,
-});
+})
-function getCompanyPages(param = {}) {
- param.current = pages.page;
- param.size = pages.pageSize;
+function getCompanyPages (param = {}) {
+ param.current = pages.page
+ param.size = pages.pageSize
getPage(param).then(res => {
let companyList = res.data.data.records
companyList.forEach(item => {
@@ -109,7 +109,7 @@
})
}
-function handleClick(item, index) {
+function handleClick (item, index) {
currentIndex.value = index
pages.page = 1
pages.pageSize = 1000
@@ -117,7 +117,7 @@
if (item.id == 1) {
formInline.firmId = ''
formInline.ownership = 1
- getLists(formInline);
+ getLists(formInline)
} else {
formInline.firmId = item.id
formInline.ownership = 2
@@ -161,57 +161,57 @@
// }
// 查询分页数据
-function getLists(param = {}) {
- param.current = pages.page;
- param.size = pages.pageSize;
- loading.value = true;
+function getLists (param = {}) {
+ param.current = pages.page
+ param.size = pages.pageSize
+ loading.value = true
getList(param)
.then((res) => {
- const data = res.data.data;
- tableData.value = data.records;
- pages.total = data.total;
- loading.value = false;
+ const data = res.data.data
+ tableData.value = data.records
+ pages.total = data.total
+ loading.value = false
})
.catch((err) => {
- loading.value = false;
- console.log(err);
- });
+ loading.value = false
+ console.log(err)
+ })
}
// 查询分页数据
-function getComLists(param = {}) {
- param.current = pages.page;
- param.size = pages.pageSize;
- loading.value = true;
+function getComLists (param = {}) {
+ param.current = pages.page
+ param.size = pages.pageSize
+ loading.value = true
getCompanyList(param)
.then((res) => {
- const data = res.data.data;
- tableData.value = data.dataList;
- pages.total = data.total;
- loading.value = false;
+ const data = res.data.data
+ tableData.value = data.dataList
+ pages.total = data.total
+ loading.value = false
})
.catch((err) => {
- loading.value = false;
- console.log(err);
- });
+ loading.value = false
+ console.log(err)
+ })
}
// 滚动到左边
const scrollLeft = () => {
if (scrollbarRef.value) {
- const currentScrollLeft = scrollbarRef.value.wrapRef.scrollLeft;
- const step = 500; // 每次滚动的距离
- scrollbarRef.value.wrapRef.scrollLeft = currentScrollLeft - step;
+ const currentScrollLeft = scrollbarRef.value.wrapRef.scrollLeft
+ const step = 500 // 每次滚动的距离
+ scrollbarRef.value.wrapRef.scrollLeft = currentScrollLeft - step
}
}
// 滚动到右边
const scrollRight = () => {
if (scrollbarRef.value) {
- const currentScrollLeft = scrollbarRef.value.wrapRef.scrollLeft;
- const step = 500; // 每次滚动的距离
- scrollbarRef.value.wrapRef.scrollLeft = currentScrollLeft + step;
+ const currentScrollLeft = scrollbarRef.value.wrapRef.scrollLeft
+ const step = 500 // 每次滚动的距离
+ scrollbarRef.value.wrapRef.scrollLeft = currentScrollLeft + step
}
}
</script>
--
Gitblit v1.9.3