From f86e7a28563a8fa129a67cf3e0e6efa534fc3be7 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期二, 31 五月 2022 15:06:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
config/dev.env.js | 12 ++++++------
src/views/doublePreventAction/hiddenDanger/inspectionRecord/components/detail.vue | 2 +-
src/components/Tab/Marker.vue | 25 +++++++++++++++++--------
3 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/config/dev.env.js b/config/dev.env.js
index 99de487..58701ac 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -18,14 +18,14 @@
// IMG_API: '"http://220.171.99.118:4100/upload/"',
// BASE_API: '"http://192.168.0.35:8006"',
// // IMG_API: '"http://192.168.0.35:8006/upload/"',
- BASE_API: '"http://192.168.0.35:8006"',
- IMG_API: '"http://192.168.0.35:8006/upload/"',
+ // BASE_API: '"http://192.168.0.35:8006"',
+ // IMG_API: '"http://192.168.0.35:8006/upload/"',
// BASE_API: '"http://192.168.0.62:8006"',
// IMG_API: '"http://192.168.0.62:8006/upload/"',
- // BASE_API: '"http://222.92.213.22:8006/zhongtai"',
- // IMG_API: '"http://222.92.213.22:8006/zhongtai/upload/"',
- NANO_API: '"http://222.92.213.22:8006/nanoweb"',
- ZT_API:'"http://123.56.127.115:8011"'
+ BASE_API: '"http://222.92.213.22:8006/zhongtai"',
+ IMG_API: '"http://222.92.213.22:8006/zhongtai/upload/"',
+ // NANO_API: '"http://222.92.213.22:8006/nanoweb"',
+ // ZT_API:'"http://123.56.127.115:8011"'
// BASE_API: '"http://localhost:8006"',
// IMG_API: '"http://localhost:8006/upload/"',
// NANO_API: '"http://localhost:8006/nanoweb"',
diff --git a/src/components/Tab/Marker.vue b/src/components/Tab/Marker.vue
index 3910ad5..8817dfe 100644
--- a/src/components/Tab/Marker.vue
+++ b/src/components/Tab/Marker.vue
@@ -110,20 +110,29 @@
<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:'../../../src/assets/icon_donghuo_s.png',name:'动火作业'},
- {id:2,url:'../../../src/assets/icon_diaozhuang_s.png',name:'吊装作业'},
- {id:3,url:'../../../src/assets/icon_gaochu_s.png',name:'高处作业'},
- {id:4,url:'../../../src/assets/icon_kongjian_s.png',name:'受限空间'},
- {id:5,url:'../../../src/assets/icon_mangban_s.png',name:'盲板抽堵'},
- {id:6,url:'../../../src/assets/icon_yongdian_s.png',name:'临时用电'},
- {id:7,url:'../../../src/assets/icon_wajue_s.png',name:'动土作业'},
- {id:8,url:'../../../src/assets/sidebar_icon4.png',name:'断路作业'},
+ {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: '消防预警' },
diff --git a/src/views/doublePreventAction/hiddenDanger/inspectionRecord/components/detail.vue b/src/views/doublePreventAction/hiddenDanger/inspectionRecord/components/detail.vue
index 1ecbfd5..0e35e0b 100644
--- a/src/views/doublePreventAction/hiddenDanger/inspectionRecord/components/detail.vue
+++ b/src/views/doublePreventAction/hiddenDanger/inspectionRecord/components/detail.vue
@@ -24,7 +24,7 @@
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="检查类型" prop="execUname">
+ <el-form-item label="巡检人" prop="execUname">
<el-input v-model="inspectionRecordForm.execUname" class="analyseUnit_input" readonly>
</el-input>
</el-form-item>
--
Gitblit v1.9.2