From c819024e241b9f7c54cc3786373ad0d2998f2190 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 05 五月 2023 08:55:46 +0800
Subject: [PATCH] 修改
---
src/components/Tab/Marker.vue | 140 +++++++++++++++++++++++++++-------------------
1 files changed, 83 insertions(+), 57 deletions(-)
diff --git a/src/components/Tab/Marker.vue b/src/components/Tab/Marker.vue
index 71b0322..8817dfe 100644
--- a/src/components/Tab/Marker.vue
+++ b/src/components/Tab/Marker.vue
@@ -9,66 +9,73 @@
<!-- />-->
</div>
<div class="model-panel-list">
- <el-row :gutter="10">
- <el-col :span="6">
- <el-button
- icon="el-icon-plus"
- size="small"
- type="primary"
- @click="showCreateHandle"
- >
- 创建
- </el-button>
+<!-- <el-row :gutter="10">-->
+<!-- <el-col :span="6">-->
+<!-- <el-button-->
+<!-- icon="el-icon-plus"-->
+<!-- size="small"-->
+<!-- type="primary"-->
+<!-- @click="showCreateHandle"-->
+<!-- >-->
+<!-- 创建-->
+<!-- </el-button>-->
+<!-- </el-col>-->
+<!-- <el-col :span="6">-->
+<!-- <el-button-->
+<!-- icon="el-icon-delete"-->
+<!-- size="small"-->
+<!-- type="danger"-->
+<!-- @click="clearHandle"-->
+<!-- >-->
+<!-- 清空-->
+<!-- </el-button>-->
+<!-- </el-col>-->
+<!-- <el-col :span="6">-->
+<!-- <el-button-->
+<!-- icon="el-icon-view"-->
+<!-- size="small"-->
+<!-- :type="showPlot ? 'success' : 'info'"-->
+<!-- @click="toggleVisible"-->
+<!-- >-->
+<!-- {{ showPlot ? '隐藏' : '显示' }}-->
+<!-- </el-button>-->
+<!-- </el-col>-->
+<!-- </el-row>-->
+<!-- <el-row :gutter="10" v-for="marker in markers" :key="marker.attr.id">-->
+ <el-row :gutter="10" v-for="item in labels" :key="item.id">
+ <el-col :span="18">
+ <img :src="item.url" style="width:30px;height:30px;" />
</el-col>
<el-col :span="6">
- <el-button
- icon="el-icon-delete"
- size="small"
- type="danger"
- @click="clearHandle"
- >
- 清空
- </el-button>
+ {{ item.name || ' ' }}
</el-col>
- <el-col :span="6">
- <el-button
- icon="el-icon-view"
- size="small"
- :type="showPlot ? 'success' : 'info'"
- @click="toggleVisible"
- >
- {{ showPlot ? '隐藏' : '显示' }}
- </el-button>
- </el-col>
- </el-row>
- <el-row :gutter="10" v-for="marker in markers" :key="marker.attr.id">
- <el-col :span="2">
- <img :src="marker.style.image" style="width:22px;height:22px;" />
- </el-col>
- <el-col :span="12">
- {{ marker.attr.name || ' ' }}
- </el-col>
- <el-col :span="10" style="textAlign:right">
- <el-button
- icon="el-icon-s-promotion"
- size="mini"
- circle
- @click="() => focusHandle(marker.attr.id)"
- />
- <el-button
- icon="el-icon-edit"
- size="mini"
- circle
- @click="() => editHandle(marker)"
- />
- <el-button
- icon="el-icon-delete"
- type="danger"
- size="mini"
- circle
- @click="() => removeHandle(marker.attr.id)"
- />
- </el-col>
+<!-- <el-col :span="20">-->
+<!-- <img :src="marker.style.image" style="width:22px;height:22px;" />-->
+<!-- </el-col>-->
+<!-- <el-col :span="4">-->
+<!-- {{ marker.attr.name || ' ' }}-->
+<!-- </el-col>-->
+<!-- <el-col :span="10" style="textAlign:right">-->
+<!-- <el-button-->
+<!-- icon="el-icon-s-promotion"-->
+<!-- size="mini"-->
+<!-- circle-->
+<!-- @click="() => focusHandle(marker.attr.id)"-->
+<!-- />-->
+<!-- <el-button-->
+<!-- icon="el-icon-edit"-->
+<!-- size="mini"-->
+<!-- circle-->
+<!-- @click="() => editHandle(marker)"-->
+<!-- />-->
+<!-- <el-button-->
+<!-- icon="el-icon-delete"-->
+<!-- type="danger"-->
+<!-- size="mini"-->
+<!-- circle-->
+<!-- @click="() => removeHandle(marker.attr.id)"-->
+<!-- />-->
+<!-- </el-col>-->
</el-row>
</div>
<el-dialog
@@ -103,11 +110,30 @@
<script>
import { global } from '@/global';
+ const img1 = require('@/assets/icon_donghuo_s.png')
+ const img2 = require('@/assets/icon_diaozhuang_s.png')
+ const img3 = require('@/assets/icon_gaochu_s.png')
+ const img4 = require('@/assets/icon_kongjian_s.png')
+ const img5 = require('@/assets/icon_mangban_s.png')
+ const img6 = require('@/assets/icon_yongdian_s.png')
+ const img7 = require('@/assets/icon_wajue_s.png')
+ const img8 = require('@/assets/sidebar_icon4.png')
+
export default {
components: {},
data() {
return {
+ labels:[
+ {id:1,url:img1,name:'动火作业'},
+ {id:2,url:img2,name:'吊装作业'},
+ {id:3,url:img3,name:'高处作业'},
+ {id:4,url:img4,name:'受限空间'},
+ {id:5,url:img5,name:'盲板抽堵'},
+ {id:6,url:img6,name:'临时用电'},
+ {id:7,url:img7,name:'动土作业'},
+ {id:8,url:img8,name:'断路作业'},
+ ],
images: [
{ url: '../../../public/images/icon/1.png', type: '消防预警' },
{ url: '../../../public/images/icon/2.png', type: '风险预警' },
--
Gitblit v1.9.2