Skip to content

G
gassafety-progress
Commit 2be046af authored by 王晓倩's avatar 王晓倩
Browse files
Options

台账管理详情页小地图

parent c692296b
Hide whitespace changes
Inline Side-by-side
Showing with 148 additions and 118 deletions
gassafetyprogress-web/src/assets/mapImages/coordinate.svg 0 → 100644
View file @ 2be046af
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1644901265903" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7343" width="32" height="32" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><style type="text/css"></style></defs><path d="M527.053 96.924c-169.131 0.322-306.127 137.496-306.127 306.7 0 157.986 128.978 324.17 278.121 502.935 7.838 9.418 17.977 14.485 28.006 15.061 10.029-0.576 20.168-5.643 28.002-15.061 149.144-178.765 278.123-344.948 278.123-502.935 0-169.205-136.997-306.378-306.126-306.7zM527.053 500.967c-66.070-0.358-119.562-53.956-119.562-120.099s53.492-119.74 119.562-120.099c66.069 0.358 119.557 53.956 119.557 120.099s-53.487 119.74-119.557 120.099z" p-id="7344" fill="#1296db"></path></svg>
\ No newline at end of file
gassafetyprogress-web/src/assets/mapImages/yalibiao.svg deleted 100644 → 0
View file @ c692296b
<svg id="组_2449" data-name="组 2449" xmlns="http://www.w3.org/2000/svg" width="23" height="33.9" viewBox="0 0 23 33.9">
<g id="路径_186" data-name="路径 186" fill="none">
<path d="M11.5,0A11.5,11.5,0,0,1,23,11.5c0,6.351-11.6,18.226-11.5,18.3S0,17.851,0,11.5A11.5,11.5,0,0,1,11.5,0Z" stroke="none"/>
<path d="M 11.5 0.9999942779541016 C 5.71027946472168 0.9999942779541016 1 5.710294723510742 1 11.50003433227539 C 1 15.44047451019287 6.295700073242188 22.62868881225586 11.47670364379883 28.30246925354004 C 12.68497562408447 26.95181846618652 15.33078575134277 23.97880172729492 17.65543937683105 20.72857475280762 C 19.63740921020508 17.95747375488281 22 14.10698509216309 22 11.50003433227539 C 22 5.710294723510742 17.28972053527832 0.9999942779541016 11.5 0.9999942779541016 M 11.5 -5.7220458984375e-06 C 17.85127067565918 -5.7220458984375e-06 23 5.148744583129883 23 11.50003433227539 C 23 17.82767868041992 11.48916530609131 29.63789367675781 11.49940204620361 29.80171203613281 C 11.36462783813477 29.63816833496094 0 17.78736114501953 0 11.50003433227539 C 0 5.148744583129883 5.14872932434082 -5.7220458984375e-06 11.5 -5.7220458984375e-06 Z M 11.49940204620361 29.80171203613281 C 11.50076866149902 29.80337142944336 11.50098419189453 29.80383491516113 11.5 29.80305480957031 C 11.49963855743408 29.80276870727539 11.49944019317627 29.80232429504395 11.49940204620361 29.80171203613281 Z" stroke="none" fill="#7bf8f4"/>
</g>
<path id="多边形_33" data-name="多边形 33" d="M4.471,0,8.941,5.961H0Z" transform="translate(16.094 29.804) rotate(180)" fill="#7bf8f4"/>
<path id="路径_966" data-name="路径 966" d="M99.476,156.616a6.028,6.028,0,0,1-1.622,2.267.9.9,0,0,1-.583.252.8.8,0,0,1-.567-.236.765.765,0,0,1-.236-.535.705.705,0,0,1,.236-.535,6.035,6.035,0,0,0,1.748-4.377A5.726,5.726,0,0,0,96.7,149.2a6.645,6.645,0,0,0-9.085.016,5.836,5.836,0,0,0-1.763,4.283,6.134,6.134,0,0,0,1.952,4.346.765.765,0,0,1,.236.535.705.705,0,0,1-.236.535.748.748,0,0,1-.567.236.8.8,0,0,1-.567-.236,7.414,7.414,0,0,1-2.047-2.724,7.528,7.528,0,0,1,1.748-8.266,7.836,7.836,0,0,1,2.629-1.685,9.392,9.392,0,0,1,6.361-.063,6.113,6.113,0,0,1,2.141,1.26c2.866,2.425,3.023,5.9,2.047,8.943Zm-7.337-7.684a4.366,4.366,0,0,0-4.377,4.267.5.5,0,0,1-.236.5.527.527,0,0,1-.567,0,.513.513,0,0,1-.236-.5,5.254,5.254,0,0,1,1.575-3.684,5.533,5.533,0,0,1,7.7,0,5.208,5.208,0,0,1,1.606,3.732.5.5,0,0,1-.236.5.527.527,0,0,1-.567,0,.513.513,0,0,1-.236-.5,4.382,4.382,0,0,0-4.424-4.314Zm.913,5.4a1.113,1.113,0,0,1-1.559-.047,1.054,1.054,0,0,1-.268-1.149l-1.212-1.2a.418.418,0,0,1,0-.6.479.479,0,0,1,.63,0l1.228,1.2a1.162,1.162,0,0,1,1.2.268,1.024,1.024,0,0,1,.331.771A1.093,1.093,0,0,1,93.052,154.333Zm.016-.016" transform="translate(-80.582 -142.727)" fill="#7bf8f4"/>
</svg>
gassafetyprogress-web/src/utils/mapClass/getPath.js
View file @ 2be046af
...@@ -248,7 +248,7 @@ export class EditorMap { ...@@ -248,7 +248,7 @@ export class EditorMap {
let device = this.createMarker({ let device = this.createMarker({
map: this.map, map: this.map,
anchor: "bottom-center", anchor: "bottom-center",
icon: require("@/assets/mapImages/yalibiao.svg"), icon: require("@/assets/mapImages/coordinate.svg"),
position: path, position: path,
extData: deviceData, extData: deviceData,
}); });
......
gassafetyprogress-web/src/views/standingBook/hidden/index.vue
View file @ 2be046af
...@@ -233,60 +233,66 @@ ...@@ -233,60 +233,66 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :title="title2" :visible.sync="open2" width="800px" append-to-body @cancel="cancel2"> <el-dialog :title="title2" :visible.sync="open2" width="1200px" append-to-body @cancel="cancel2" @close="cancel2">
<el-form ref="detailForm" :model="detailForm" label-width="120px"> <el-row>
<el-row> <el-col :span="14">
<el-col :span="11"> <el-form ref="detailForm" :model="detailForm" label-width="120px">
<el-form-item label="隐患名称:"> <el-row>
<font>{{detailForm.hiddenTitle}}</font> <el-col :span="10">
</el-form-item> <el-form-item label="隐患名称:">
<el-form-item label="隐患发现人员:"> <font>{{detailForm.hiddenTitle}}</font>
<font>{{detailForm.hiddenFindPeople}}</font> </el-form-item>
</el-form-item> <el-form-item label="隐患发现人员:">
<el-form-item label="隐患位置:"> <font>{{detailForm.hiddenFindPeople}}</font>
<font>{{detailForm.hiddenLocation}}</font> </el-form-item>
</el-form-item> <el-form-item label="发现时间:">
</el-col> <font>{{detailForm.hiddenFindDate}}</font>
<el-col :span="12"> </el-form-item>
<el-form-item label="隐患等级:"> </el-col>
<font v-if="detailForm.hiddenType == '1'">一级隐患</font> <el-col :span="13">
<font v-if="detailForm.hiddenType == '2'">二级隐患</font> <el-form-item label="隐患等级:">
<font v-if="detailForm.hiddenType == '3'">三级隐患</font> <font v-if="detailForm.hiddenType == '1'">一级隐患</font>
</el-form-item> <font v-if="detailForm.hiddenType == '2'">二级隐患</font>
<el-form-item label="发现时间:"> <font v-if="detailForm.hiddenType == '3'">三级隐患</font>
<font>{{detailForm.hiddenFindDate}}</font> </el-form-item>
</el-form-item> <el-form-item label="隐患位置:">
<el-form-item label="处理方案:"> <font>{{detailForm.hiddenLocation}}</font>
<span </el-form-item>
class="dbtn" <el-form-item label="处理方案:">
@click="checkFile(detailForm.dealPlanUrl)" <span class="dbtn" @click="checkFile(detailForm.dealPlanUrl)" v-if="detailForm.dealPlan != ''">
v-if="detailForm.dealPlan != ''" <i class="el-icon el-icon-view"></i>查看/下载
> </span>
<i class="el-icon el-icon-view"></i>查看/下载 <span v-else>-</span>
</span> </el-form-item>
<span v-else>-</span> </el-col>
</el-form-item> </el-row>
</el-col> <el-row>
</el-row> <el-form-item label="隐患内容:">
<el-row> <font>{{detailForm.hiddenContent}}</font>
<el-form-item label="隐患内容:"> </el-form-item>
<font>{{detailForm.hiddenContent}}</font> </el-row>
</el-form-item> <el-row>
</el-row> <el-form-item label="整治情况:">
<el-row> <font v-if="detailForm.remediation != '' && detailForm.remediation != null">{{detailForm.remediation}}</font>
<el-form-item label="整治情况:"> <font v-else> - </font>
<font v-if="detailForm.remediation != '' && detailForm.remediation != null">{{detailForm.remediation}}</font> </el-form-item>
<font v-else> - </font> </el-row>
</el-form-item> <el-row>
</el-row> <el-form-item label="备注信息:">
<el-row> <font v-if="detailForm.remarks != '' && detailForm.remarks != null">{{detailForm.remarks}}</font>
<el-form-item label="备注信息:"> <font v-else> - </font>
<font v-if="detailForm.remarks != '' && detailForm.remarks != null">{{detailForm.remarks}}</font> </el-form-item>
<font v-else> - </font> </el-row>
</el-form-item> </el-form>
</el-row> </el-col>
</el-form>
</el-dialog> <el-col :span="9">
<div id="marbox" style="width: 100%;height: 390px;margin-top: -25px; border: 1px solid rgb(218, 213, 213);margin-bottom: 10px;">
<div style="width: 100%;height: 100%" id="detailContainer"></div>
</div>
</el-col>
</el-row>
</el-dialog>
<GetPos <GetPos
:dialogVisible.sync="dialogTableVisible" :dialogVisible.sync="dialogTableVisible"
...@@ -301,15 +307,14 @@ ...@@ -301,15 +307,14 @@
<script> <script>
import { listHidden, getHidden, delHidden, addHidden, updateHidden, exportHidden } from "@/api/standingBook/hidden"; import { listHidden, getHidden, delHidden, addHidden, updateHidden, exportHidden } from "@/api/standingBook/hidden";
import Editor from '@/components/Editor';
import FileUpload from '@/components/FileUpload'; import FileUpload from '@/components/FileUpload';
import GetPos from '@/components/GetPos'; import GetPos from '@/components/GetPos';
import { EditorMap } from "@/utils/mapClass/getPath.js";
let uploadfile = require("@/assets/uploadfile.png"); let uploadfile = require("@/assets/uploadfile.png");
export default { export default {
name: "Hidden", name: "Hidden",
components: { components: {
Editor,
FileUpload, FileUpload,
GetPos GetPos
}, },
...@@ -344,6 +349,7 @@ export default { ...@@ -344,6 +349,7 @@ export default {
// 地图 // 地图
dialogTableVisible: false, dialogTableVisible: false,
devicePos: [], devicePos: [],
map: null,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
...@@ -406,11 +412,11 @@ export default { ...@@ -406,11 +412,11 @@ export default {
this.open1 = false; this.open1 = false;
this.reset1(); this.reset1();
this.fileList = []; this.fileList = [];
this.devicePos = [];
}, },
cancel2() { cancel2() {
this.open2 = false; this.open2 = false;
this.reset2(); this.reset2();
this.map.destroy();
}, },
// 表单重置 // 表单重置
reset1() { reset1() {
...@@ -458,6 +464,7 @@ export default { ...@@ -458,6 +464,7 @@ export default {
remarks: null remarks: null
}; };
this.resetForm("detailForm"); this.resetForm("detailForm");
this.devicePos = [];
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
...@@ -546,8 +553,16 @@ export default { ...@@ -546,8 +553,16 @@ export default {
this.reset2(); this.reset2();
getHidden(row.hiddenId).then(response => { getHidden(row.hiddenId).then(response => {
this.detailForm = response.data; this.detailForm = response.data;
this.devicePos = [this.detailForm.longitude, this.detailForm.latitude];
this.open2 = true; this.open2 = true;
this.title2 = "隐患整治台账详情"; this.title2 = "隐患整治台账详情";
this.$nextTick(() => {
this.map = new EditorMap("detailContainer", {}, this);
this.map.addDevice({ path: this.devicePos });
this.map.nowMouseTarget = null;
this.map.mousetoolClose(false);
});
}); });
}, },
checkFile(url) { checkFile(url) {
......
gassafetyprogress-web/src/views/standingBook/trouble/index.vue
View file @ 2be046af
...@@ -242,61 +242,71 @@ ...@@ -242,61 +242,71 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :title="title2" :visible.sync="open2" width="800px" append-to-body @cancel="cancel2"> <el-dialog :title="title2" :visible.sync="open2" width="1200px" append-to-body @cancel="cancel2" @close="cancel2">
<el-form ref="detailForm" :model="detailForm" label-width="120px"> <el-row>
<el-row> <el-col :span="14">
<el-col :span="11"> <el-form ref="detailForm" :model="detailForm" label-width="120px">
<el-form-item label="事故名称:"> <el-row>
<font>{{detailForm.troubleName}}</font> <el-col :span="10">
</el-form-item> <el-form-item label="事故名称:">
<el-form-item label="事故原因:"> <font>{{detailForm.troubleName}}</font>
<font>{{detailForm.troubleReason}}</font> </el-form-item>
</el-form-item> <el-form-item label="事故原因:">
<el-form-item label="责任单位:"> <font>{{detailForm.troubleReason}}</font>
<font v-if="detailForm.responsibleUnit != '' && detailForm.responsibleUnit != null">{{detailForm.responsibleUnit}}</font> </el-form-item>
<el-form-item label="责任单位:">
<font v-if="detailForm.responsibleUnit != '' && detailForm.responsibleUnit != null">{{detailForm.responsibleUnit}}</font>
<font v-else> - </font>
</el-form-item>
</el-col>
<el-col :span="13">
<el-form-item label="事故类型:">
<font v-if="detailForm.troubleType == '1'">安全生产事故</font>
<font v-if="detailForm.troubleType == '2'">非生产安全事故</font>
</el-form-item>
<el-form-item label="事故地点:">
<font>{{detailForm.troubleLocation}}</font>
</el-form-item>
<el-form-item label="责任人员:">
<font v-if="detailForm.responsiblePeople != '' && detailForm.responsiblePeople != null">{{detailForm.responsiblePeople}}</font>
<font v-else> - </font>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-form-item label="简要经过:">
<font v-if="detailForm.briefProcess != '' && detailForm.briefProcess != null">{{detailForm.briefProcess}}</font>
<font v-else> - </font> <font v-else> - </font>
</el-form-item> </el-form-item>
</el-col> </el-row>
<el-col :span="12"> <el-row>
<el-form-item label="事故类型:"> <el-col :span="11">
<font v-if="detailForm.troubleType == '1'">安全生产事故</font> <el-form-item label="是否处理:">
<font v-if="detailForm.troubleType == '2'">非生产安全事故</font> <font v-if="detailForm.isDeal == '1'">已处理</font>
</el-form-item> <font v-if="detailForm.isDeal == '2'">未处理</font>
<el-form-item label="事故地点:"> </el-form-item>
<font>{{detailForm.troubleLocation}}</font> </el-col>
</el-form-item> <el-col :span="12">
<el-form-item label="责任人员:"> <el-form-item label="处理完成时间:">
<font v-if="detailForm.responsiblePeople != '' && detailForm.responsiblePeople != null">{{detailForm.responsiblePeople}}</font> <font>{{detailForm.dealDate}}</font>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-form-item label="备注信息:">
<font v-if="detailForm.remarks != '' && detailForm.remarks != null">{{detailForm.remarks}}</font>
<font v-else> - </font> <font v-else> - </font>
</el-form-item> </el-form-item>
</el-col> </el-row>
</el-row> </el-form>
<el-row> </el-col>
<el-form-item label="简要经过:">
<font v-if="detailForm.briefProcess != '' && detailForm.briefProcess != null">{{detailForm.briefProcess}}</font> <el-col :span="9">
<font v-else> - </font> <div id="marbox" style="width: 100%;height: 390px;margin-top: -25px; border: 1px solid rgb(218, 213, 213);margin-bottom: 10px;">
</el-form-item> <div style="width: 100%;height: 100%" id="detailContainer"></div>
</el-row> </div>
<el-row> </el-col>
<el-col :span="11"> </el-row>
<el-form-item label="是否处理:">
<font v-if="detailForm.isDeal == '1'">已处理</font>
<font v-if="detailForm.isDeal == '2'">未处理</font>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="处理完成时间:">
<font>{{detailForm.dealDate}}</font>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-form-item label="备注信息:">
<font v-if="detailForm.remarks != '' && detailForm.remarks != null">{{detailForm.remarks}}</font>
<font v-else> - </font>
</el-form-item>
</el-row>
</el-form>
</el-dialog> </el-dialog>
<GetPos <GetPos
...@@ -313,6 +323,7 @@ ...@@ -313,6 +323,7 @@
<script> <script>
import { listTrouble, getTrouble, delTrouble, addTrouble, updateTrouble, exportTrouble } from "@/api/standingBook/trouble"; import { listTrouble, getTrouble, delTrouble, addTrouble, updateTrouble, exportTrouble } from "@/api/standingBook/trouble";
import GetPos from '@/components/GetPos'; import GetPos from '@/components/GetPos';
import { EditorMap } from "@/utils/mapClass/getPath.js";
export default { export default {
name: "Trouble", name: "Trouble",
...@@ -343,6 +354,7 @@ export default { ...@@ -343,6 +354,7 @@ export default {
// 地图 // 地图
dialogTableVisible: false, dialogTableVisible: false,
devicePos: [], devicePos: [],
map: null,
// 弹出层标题 // 弹出层标题
title1: "", title1: "",
title2: "", title2: "",
...@@ -416,11 +428,11 @@ export default { ...@@ -416,11 +428,11 @@ export default {
cancel1() { cancel1() {
this.open1 = false; this.open1 = false;
this.reset1(); this.reset1();
this.devicePos = [];
}, },
cancel2() { cancel2() {
this.open2 = false; this.open2 = false;
this.reset2(); this.reset2();
this.map.destroy();
}, },
// 表单重置 // 表单重置
reset1() { reset1() {
...@@ -471,6 +483,7 @@ export default { ...@@ -471,6 +483,7 @@ export default {
remarks: null remarks: null
}; };
this.resetForm("detailForm"); this.resetForm("detailForm");
this.devicePos = [];
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
...@@ -553,8 +566,17 @@ export default { ...@@ -553,8 +566,17 @@ export default {
this.reset2(); this.reset2();
getTrouble(row.troubleId).then(response => { getTrouble(row.troubleId).then(response => {
this.detailForm = response.data; this.detailForm = response.data;
this.devicePos = [this.detailForm.longitude, this.detailForm.latitude];
console.log("this.devicePos",this.devicePos);
this.open2 = true; this.open2 = true;
this.title2 = "燃气事故台账详情"; this.title2 = "燃气事故台账详情";
this.$nextTick(() => {
this.map = new EditorMap("detailContainer", {}, this);
this.map.addDevice({ path: this.devicePos });
this.map.nowMouseTarget = null;
this.map.mousetoolClose(false);
});
}); });
}, },
MapdialogFun() { MapdialogFun() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment