From 6c74bf912e251347714099a84585f825b32a1c08 Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期一, 18 十二月 2023 17:52:05 +0800
Subject: [PATCH] Merge branch 'feature-001' of ssh://114.215.109.124:29418/supervision-vue into feature-001
---
src/views/baseinfo/fysp/scene/SceneInfo.vue | 270 ++++++++++++++---------------------------------------
1 files changed, 73 insertions(+), 197 deletions(-)
diff --git a/src/views/baseinfo/fysp/scene/SceneInfo.vue b/src/views/baseinfo/fysp/scene/SceneInfo.vue
index 9fe1c9e..b3e7682 100644
--- a/src/views/baseinfo/fysp/scene/SceneInfo.vue
+++ b/src/views/baseinfo/fysp/scene/SceneInfo.vue
@@ -1,122 +1,63 @@
<template>
- <el-row ref="searchRef">
- <el-form :inline="true" :model="formSearch">
- <el-form-item label="鐪�/甯�/鍖�/闀�" prop="_locations">
- <!-- <el-cascader
- v-model="formSearch._locations"
- :options="locations"
- placeholder="鐪�/甯�/鍖�/闀�"
- :props="props"
- style="width: 280px"
- /> -->
- <OptionLocation
- :allOption="true"
- :level="4"
- v-model:value="formSearch._locations"
- ></OptionLocation>
- </el-form-item>
- <el-form-item label="鍦烘櫙绫诲瀷" prop="scensetype">
- <OptionScene
- :allOption="true"
- :type="2"
- v-model:value="formSearch.scensetype"
- ></OptionScene>
- <!-- <el-select
- v-model="formSearch.scensetypeid"
- placeholder="鍦烘櫙绫诲瀷"
- style="width: 150px"
- >
- <el-option
- v-for="s in sceneTypes"
- :key="s.value"
- :label="s.label"
- :value="s.value"
- />
- </el-select> -->
- </el-form-item>
- <el-form-item label="涓婄嚎鐘舵��" prop="online">
- <OptionOnlineStatus
- :allOption="true"
- v-model:value="formSearch.online"
- ></OptionOnlineStatus>
- <!-- <el-select
- v-model="formSearch.online"
- placeholder="涓婄嚎鐘舵��"
- style="width: 75px"
- >
- <el-option
- v-for="s in onlineStatus"
- :key="s.value"
- :label="s.label"
- :value="s.value"
- />
- </el-select> -->
- </el-form-item>
- <el-form-item>
- <el-button icon="Search" type="primary" @click="onSearch"
- >鏌ヨ</el-button
- >
- </el-form-item>
- </el-form>
- </el-row>
+ <FYTable @search="onSearch">
+ <template #options>
+ <FYOptionLocation
+ :allOption="true"
+ :level="4"
+ v-model:value="formSearch._locations"
+ ></FYOptionLocation>
+ <FYOptionScene
+ :allOption="true"
+ :type="2"
+ v-model:value="formSearch.scensetype"
+ ></FYOptionScene>
+ <FYOptionOnlineStatus
+ :allOption="true"
+ v-model:value="formSearch.online"
+ ></FYOptionOnlineStatus>
+ </template>
- <el-table
- :data="tableData"
- v-loading="loading"
- table-layout="fixed"
- :row-class-name="tableRowClassName"
- :height="tableHeight"
- >
- <el-table-column prop="name" label="鍚嶇О" width="400">
- <template #default="scope">
- <el-tooltip
- effect="dark"
- :content="scope.row.name"
- placement="top-start"
- :show-after="500"
- >
- {{ scope.row.name }}
- </el-tooltip>
- </template>
- </el-table-column>
- <el-table-column prop="type" label="绫诲瀷" width="130" />
- <el-table-column prop="provincename" label="鐪�" width="90" />
- <el-table-column prop="cityname" label="甯�" width="90" />
- <el-table-column prop="districtname" label="鍖哄幙" width="90" />
- <el-table-column prop="townname" label="琛楅亾" width="110" />
- <el-table-column prop="location" label="鍦板潃" min-width="400" />
- <el-table-column prop="longitude" label="缁忓害" width="110" />
- <el-table-column prop="latitude" label="绾害" width="110" />
- <el-table-column fixed="right" label="鎿嶄綔" width="160">
- <template #default="scope">
- <el-button
- :loading="scope.row.loading1"
- type="default"
- size="small"
- @click="itemEdit(scope)"
- >缂栬緫</el-button
- >
- <el-button
- :loading="scope.row.loading2"
- :type="scope.row.extension1 != '0' ? 'danger' : 'primary'"
- size="small"
- @click="itemActive(scope)"
- >{{ scope.row.extension1 != '0' ? '涓嬬嚎' : '涓婄嚎' }}</el-button
- >
- </template>
- </el-table-column>
- </el-table>
-
- <el-pagination
- ref="paginationRef"
- class="el-pagination"
- v-model:current-page="currentPage"
- v-model:page-size="pageSize"
- :page-sizes="[10, 20, 50, 100]"
- :background="true"
- layout="total, sizes, prev, pager, next, jumper"
- :total="total"
- />
+ <template #table-column>
+ <el-table-column fixed="left" prop="name" label="鍚嶇О" width="400">
+ <template #default="scope">
+ <el-tooltip
+ effect="dark"
+ :content="scope.row.name"
+ placement="top-start"
+ :show-after="500"
+ >
+ {{ scope.row.name }}
+ </el-tooltip>
+ </template>
+ </el-table-column>
+ <el-table-column prop="type" label="绫诲瀷" width="130" />
+ <el-table-column prop="provincename" label="鐪�" width="90" />
+ <el-table-column prop="cityname" label="甯�" width="90" />
+ <el-table-column prop="districtname" label="鍖哄幙" width="90" />
+ <el-table-column prop="townname" label="琛楅亾" width="110" />
+ <el-table-column prop="location" label="鍦板潃" min-width="400" />
+ <el-table-column prop="longitude" label="缁忓害" width="110" />
+ <el-table-column prop="latitude" label="绾害" width="110" />
+ <el-table-column fixed="right" label="鎿嶄綔" width="160">
+ <template #default="scope">
+ <el-button
+ :loading="scope.row.loading1"
+ type="default"
+ size="small"
+ @click="itemEdit(scope)"
+ >缂栬緫</el-button
+ >
+ <el-button
+ :loading="scope.row.loading2"
+ :type="scope.row.extension1 != '0' ? 'danger' : 'primary'"
+ size="small"
+ @click="itemActive(scope)"
+ >{{ scope.row.extension1 != '0' ? '涓嬬嚎' : '涓婄嚎' }}</el-button
+ >
+ </template>
+ </el-table-column>
+ </template>
+ </FYTable>
</template>
<script>
@@ -129,82 +70,44 @@
data() {
return {
formSearch: {
- _locations: [],
+ _locations: {},
scensetype: {},
online: {},
},
-
- tableData: [],
- tableHeight: '500',
- loading: false,
-
- currentPage: 1,
- pageSize: 20,
- total: 0,
};
- },
- watch: {
- currentPage(nValue, oValue) {
- if (nValue != oValue) {
- this.onSearch();
- }
- },
- pageSize(nValue, oValue) {
- if (nValue != oValue) {
- this.onSearch();
- }
- },
},
computed: {
...mapStores(useLoadingStore),
},
methods: {
- onSearch() {
- this.loading = true;
+ onSearch(page, func) {
const f = this.formSearch;
const area = {};
// 琛屾斂鍖哄垝
- f._locations.length > 0
- ? (area.provincecode = f._locations[0][0])
- : (area.provincecode = null);
- if (area.provincecode == '0') area.provincecode = null;
- f._locations.length > 1
- ? (area.citycode = f._locations[1][0])
- : (area.citycode = null);
- f._locations.length > 2
- ? (area.districtcode = f._locations[2][0])
- : (area.districtcode = null);
- f._locations.length > 3
- ? (area.towncode = f._locations[3][0])
- : (area.towncode = null);
+ area.provincecode = f._locations.pCode
+ area.citycode = f._locations.cCode
+ area.districtcode = f._locations.dCode
+ area.towncode = f._locations.tCode
// 鍦烘櫙绫诲瀷
area.scensetypeid = f.scensetype.value;
if (area.scensetypeid == '0') area.scensetypeid = null;
// 涓婁笅绾跨姸鎬�
area.online = f.online.value;
- sceneApi
- .searchScene(area, this.currentPage, this.pageSize)
+ return sceneApi
+ .searchScene(area, page.currentPage, page.pageSize)
.then((res) => {
if (res.success) {
- this.tableData = res.data;
- this.currentPage = res.head.page;
- this.total = res.head.totalCount;
+ func({
+ data: res.data,
+ total: res.head.totalCount,
+ });
}
- })
- .finally(() => {
- this.loading = false;
});
- },
- calcTableHeight() {
- const h1 = this.$refs.searchRef.$el.offsetHeight;
- const h2 = this.$refs.paginationRef.$el.offsetHeight;
- // return `calc(100vh - ${h1}px - ${h2}px - var(--el-main-padding) * 2 - var(--el-header-height))`;
- return `calc(100vh - ${h1}px - ${h2}px - 60px - var(--el-main-padding) * 2)`;
},
itemEdit(scope) {
scope.row.loading1 = true;
- this.loadingStore.loadingStatus.push(() => (scope.row.loading1 = false));
+ this.loadingStore.pushLoading(() => (scope.row.loading1 = false));
this.$router.push(`sceneEdit/${scope.row.guid}`);
},
itemActive(scope) {
@@ -217,7 +120,7 @@
confirmTitle: msg,
onConfirm: () => {
scope.row.loading2 = true;
- sceneApi
+ return sceneApi
.updateScene(rb)
.then((res) => {
if (res == 1) {
@@ -230,35 +133,8 @@
},
});
},
- tableRowClassName({ row }) {
- return row.extension1 != '0' ? 'online-row' : 'offline-row';
- },
- },
- mounted() {
- this.tableHeight = this.calcTableHeight();
- this.onSearch();
},
};
</script>
-<style>
-.el-table .online-row {
- /* background-color: rgb(4, 202, 21); */
-}
-
-.el-table .offline-row {
- background-color: var(--el-disabled-bg-color);
- color: var(--el-disabled-text-color);
-}
-
-.el-table .cell {
- white-space: nowrap;
-}
-
-.el-pagination {
- background-color: var(--el-color-white);
- padding-top: 20px;
- border-top: 1px solid rgba(0, 0, 0, 0.096);
- /* margin-top: 2px; */
-}
-</style>
+<style></style>
--
Gitblit v1.9.3