From 8a3046817d6bf207f38accd0cd6b65d770db3bea Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 12 九月 2025 17:20:08 +0800
Subject: [PATCH] 1. 修改静安第三方接口url地址 2. 修改静安新增设备匹配功能中，上传的经纬度信息为我方的信息
---
src/views/fysp/task/components/CompMonitorObjEdit.vue | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/src/views/fysp/task/components/CompMonitorObjEdit.vue b/src/views/fysp/task/components/CompMonitorObjEdit.vue
index 517f03b..01de63a 100644
--- a/src/views/fysp/task/components/CompMonitorObjEdit.vue
+++ b/src/views/fysp/task/components/CompMonitorObjEdit.vue
@@ -10,7 +10,7 @@
</div>
<el-divider />
<CompMonitorObj
- height="68vh"
+ height="62vh"
:data="curMonitorObjList"
show-btn
v-model:tabName="curSceneType"
@@ -21,14 +21,22 @@
</CompMonitorObj>
</el-col>
<el-col :span="8">
- <el-affix :offset="140">
+ <!-- <el-affix :offset="140"> -->
<div>
<el-text>鍙�夊満鏅�</el-text>
</div>
<el-divider />
- <div>
- <el-segmented v-model="curSceneType" :options="sceneTypeOptions" />
- </div>
+ <el-scrollbar class="scrollbar-flex-content" always >
+ <!-- <el-segmented v-model="curSceneType" :options="sceneTypeOptions" /> -->
+ <el-tabs v-model="curSceneType">
+ <el-tab-pane
+ v-for="item in sceneTypeOptions"
+ :key="item"
+ :label="item"
+ :name="item"
+ ></el-tab-pane>
+ </el-tabs>
+ </el-scrollbar>
<FYInfoSearch
placeholder="璇疯緭鍏ュ満鏅悕绉板叧閿瓧"
:data="showSceneList"
@@ -56,7 +64,7 @@
</ItemScene>
</template>
</FYInfoSearch>
- </el-affix>
+ <!-- </el-affix> -->
</el-col>
</el-row>
@@ -245,7 +253,7 @@
const total = this.curMonitorObjList.length;
const map = new Map();
this.curMonitorObjList.forEach((e) => {
- const d = e.scene
+ const d = e.scene;
if (!map.has(d.type)) {
map.set(d.type, { num: 0 });
}
@@ -274,7 +282,13 @@
});
},
deleteMov(item) {
- if (item.extension1) {
+ if (
+ !(
+ item.extension1 == null ||
+ item.extension1 == undefined ||
+ item.extension1 == '0'
+ )
+ ) {
ElMessage({
message: '宸茬洃绠″満鏅棤娉曠Щ闄�',
type: 'error'
@@ -448,4 +462,10 @@
};
</script>
-<style scoped></style>
+<style scoped>
+.scrollbar-flex-content {
+ display: flex;
+ /* width: fit-content; */
+ height: min-content;
+}
+</style>
--
Gitblit v1.9.3