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/CompMonitorObj.vue | 70 ++++++++++++++++++++++++++++-------
1 files changed, 56 insertions(+), 14 deletions(-)
diff --git a/src/views/fysp/task/components/CompMonitorObj.vue b/src/views/fysp/task/components/CompMonitorObj.vue
index 0047d9f..65da3fe 100644
--- a/src/views/fysp/task/components/CompMonitorObj.vue
+++ b/src/views/fysp/task/components/CompMonitorObj.vue
@@ -1,21 +1,45 @@
<template>
<div class="monitor-obj-wrapper">
<el-affix v-if="affix" :offset="60" target=".monitor-obj-wrapper">
- <div>
- <el-segmented
+ <el-scrollbar class="p-b-8" always>
+ <!-- <el-segmented
:model-value="activeName"
:options="activeTabs"
@change="tabChange"
- />
- </div>
+ /> -->
+ <el-tabs v-model="activeName" @tab-change="tabChange">
+ <el-tab-pane
+ v-for="item in activeTabs"
+ :key="item"
+ :label="item"
+ :name="item"
+ ></el-tab-pane>
+ </el-tabs>
+ </el-scrollbar>
</el-affix>
- <div v-else>
- <el-segmented
+ <el-scrollbar class="" always v-else>
+ <!-- <el-segmented
:model-value="activeName"
:options="activeTabs"
@change="tabChange"
- />
- </div>
+ /> -->
+ <el-tabs v-model="activeName" @tab-change="tabChange">
+ <el-tab-pane
+ v-for="item in activeTabs"
+ :key="item"
+ :label="item"
+ :name="item"
+ ></el-tab-pane>
+ </el-tabs>
+ </el-scrollbar>
+ <el-space size="large">
+ <el-tag type="info"> 鎬绘暟锛歿{ activeData.length }} </el-tag>
+ <el-checkbox-group v-model="checkList">
+ <el-checkbox label="鏈洃绠�" :value="0" />
+ <el-checkbox label="宸茬洃绠�" :value="1" />
+ <el-checkbox label="宸插鏍�" :value="2" />
+ </el-checkbox-group>
+ </el-space>
<el-scrollbar :height="height">
<el-space wrap>
<ItemMonitorObj v-for="obj in activeData" :key="obj.movid" :item="obj">
@@ -60,7 +84,7 @@
},
btnType: {
type: String,
- default: 'danger'
+ default: 'default'
},
// 澶撮儴閫夐」鏄惁鍚搁《
affix: Boolean,
@@ -70,16 +94,34 @@
data() {
return {
activeName: defaultTabName,
- tabs: []
+ tabs: [],
+ checkList: [0, 1, 2]
};
},
computed: {
activeData() {
const list = this.data.filter((v) => {
- return (
- this.activeName == defaultTabName || v.sceneType == this.activeName
- );
- // return this.tabName == defaultTabName || v.sceneType == this.tabName;
+ // 绛涢�夊綋鍓嶉�夋嫨鐨勬爣绛鹃〉瀵瑰簲鐨勫満鏅被鍨�
+ const b1 =
+ this.activeName == defaultTabName || v.sceneType == this.activeName;
+
+ // 璁＄畻鍦烘櫙鐨勭洃绠＄姸鎬�
+ let status;
+ if (v.extension1 == undefined || null) {
+ // 鏈洃绠�
+ status = 0;
+ } else {
+ const num = parseInt(v.extension1);
+ if (num >= 2) {
+ // 宸插鏍�
+ status = 2;
+ } else {
+ // 宸茬洃绠★紙1娆★級
+ status = num;
+ }
+ }
+ const b2 = this.checkList.indexOf(status) != -1;
+ return b1 && b2;
});
this.$emit('update:showData', list);
return list;
--
Gitblit v1.9.3