From 4c00d4aaf015fc5afcea605d1144526a9de538fa Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 17 一月 2025 11:47:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/index.vue | 44 +++++++++++++++++++++-----------------------
1 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/src/views/index.vue b/src/views/index.vue
index 0b72951..d015b96 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -71,7 +71,7 @@
:countExceptionProjectData="countExceptionProjectData"
/>
</div>
- <!-- 浠ｅ姙浜嬮」 -->
+ <!-- 寰呭姙浜嬮」 -->
<div class="flex">
<div class="flex_card">
<el-card>
@@ -117,7 +117,7 @@
id="DangerSourceId"
ref="mapRef"
:is-show-control="true"
- :list-type="true"
+ :list-type="false"
:map-list="tableDatas"
:map-type="true"
class="w-full h-full border-r border-[#DBDEEA]"
@@ -140,7 +140,6 @@
import Map from "./components/Map/index.vue";
import { getCalculatioln, getAbnormalData } from "@/api/login";
import { searchByKey } from "@/api/projectEngineering/projectInfo";
-
export default {
name: "Index",
data() {
@@ -218,6 +217,25 @@
this.abnormalData(obj);
},
+ // 鍦板浘鎼滅储
+ searchList() {
+ var _this = this;
+ searchByKey({ wordKey: this.searchForm.name }).then((res) => {
+ if (res.code == 200) {
+ if (res.data.length > 0) {
+ // this.$refs["mapRef"].showProjectInfo(res.data);
+ // _this.tableDatas = res.data;
+ setTimeout(() => {
+ _this.$refs["mapRef"].makeAllMask(res.data);
+ }, 2000);
+ } else {
+ _this.$message.error("鏈煡璇㈠埌瀵瑰簲椤圭洰");
+ }
+ } else {
+ _this.$message.error(res.msg);
+ }
+ });
+ },
// 鑾峰彇寮傚父鏁版嵁
async abnormalData(obj) {
const res = await getAbnormalData(obj);
@@ -248,26 +266,6 @@
};
this.timeMerge = [];
this.handleQuery();
- },
-
- // 鍦板浘鎼滅储
- searchList() {
- var _this = this;
- searchByKey({ wordKey: this.searchForm.name }).then((res) => {
- if (res.code == 200) {
- if (res.data.length > 0) {
- // this.$refs["mapRef"].showProjectInfo(res.data);
- // _this.tableDatas = res.data;
- setTimeout(() => {
- _this.$refs["mapRef"].makeAllMask(res.data);
- }, 2000);
- } else {
- _this.$message.error("鏈煡璇㈠埌瀵瑰簲椤圭洰");
- }
- } else {
- _this.$message.error(res.msg);
- }
- });
},
mapQuery() {},
},
--
Gitblit v1.8.0