Skip to content

G
gassafety
Commit b619ccfa authored by 耿迪迪's avatar 耿迪迪
Browse files
Options

地图中心及工单 gengdidi

parent 525e7f91
Show whitespace changes
Inline Side-by-side
Showing with 193 additions and 96 deletions
gassafety-web/.env.development
View file @ b619ccfa
......@@ -4,6 +4,8 @@ ENV = 'development'
# 燃气安全管理系统/开发环境
VUE_APP_BASE_API = '/dev-api'
#地图中心
VUE_APP_MAP_CENTER = '石家庄'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
gassafety-web/.env.production
View file @ b619ccfa
......@@ -4,4 +4,7 @@ ENV = 'production'
# 燃气安全管理系统/生产环境
VUE_APP_BASE_API = '/prod-api'
#地图中心
VUE_APP_MAP_CENTER = '石家庄'
port = 8091
gassafety-web/src/components/mapDialog/checkPipeLineLocation.vue
View file @ b619ccfa
......@@ -52,7 +52,7 @@
if(value){
window.addEventListener("click", this.barClose);
this.$nextTick(() => {
this.map = new gaodeMap("石家庄");
this.map = new gaodeMap(process.env.VUE_APP_MAP_CENTER);
this.map.addMouseTool();
if(this.str){
this.map.addPolyline([{coordinates:this.str}]);
......
gassafety-web/src/utils/gaodeMap.js
View file @ b619ccfa
......@@ -41,10 +41,12 @@ class gaodeMap {
leftListClick = false;
//构造函数中设置中央点默认值
constructor(center, latlng) {
constructor(center, latlng,containerId) {
let container = containerId ? containerId : "container";
this.markers = [];
console.log(center,"........,,,,,,,<<<<<<,")
this.center = center ? center : defaultCenter;
map = new AMap.Map("container", {
map = new AMap.Map(container, {
//mask: addMask(result.districtList[0].boundaries),
center: [114.72995, 38.37417],
// resizeEnable: true,
......
gassafety-web/src/views/dataMonitoring/alarmdetail/index.vue
View file @ b619ccfa
<template>
<div class="app-container detail" style="background-color: rgb(238, 241, 245);">
<div style="padding-top: 10px;background: #fff;height: 100%;">
<el-row>
<el-row v-if ="resourceId == undefined">
<el-col :span="24" style="padding-left: 15px;margin-bottom: -10px;">
<div style="height: 45px;" @click="$router.go(-1)">
<el-button size="medium" type="text" style="font-size: 18px; color: rgb(7, 63, 112);float: left;">返回
......@@ -55,7 +55,8 @@
<el-form-item label="工单编号:" prop="orderId">
<!-- <font>{{form.orderId}}</font> -->
<template slot-scope="scope">
<el-button type="text" @click="showDetail(form.orderId)">{{form.orderId}}</el-button>
<font v-if="resourceId != undefined">{{form.orderId}}</font>
<el-button type="text" @click="showDetail(form.orderId)" v-if="resourceId == undefined">{{form.orderId}}</el-button>
</template>
</el-form-item>
<el-form-item label="处理状态:" prop="dealStatus">
......@@ -152,7 +153,7 @@
<el-col :span="8" style="padding: 10px;padding-left: 0px;">
<div id="marbox" style="width: 100%;height: 304px; border: 1px solid rgb(218, 213, 213);float: right;">
<div style="width: 100%;height: 100%" id="container"></div>
<div style="width: 100%;height: 100%" id="containerAlarm"></div>
</div>
</el-col>
</el-row>
......@@ -249,6 +250,7 @@
import echarts from 'echarts';
export default {
props:["resourceId"],
name: "DeviceAlarm",
components: {
},
......@@ -277,7 +279,12 @@ export default {
},
created() {
// 如果是跳转来的，则接受初始化参数
this.alarmId = +this.$route.query.alarmId;
if(this.resourceId){
this.alarmId = this.resourceId;
}else{
this.alarmId = this.$route.query.alarmId;
}
this.getDetail();
},
mounted() {
......@@ -668,7 +675,7 @@ export default {
const path1 = eval(coordinates)[0];
const path2 = eval(coordinates)[1];
const path3 = [(Number(path1[0]) + Number(path2[0])) / 2, (Number(path1[1]) + Number(path2[1])) / 2];
let gaoMap = new gaodeMap("石家庄",path3);
let gaoMap = new gaodeMap(process.env.VUE_APP_MAP_CENTER,path3,"containerAlarm");
this.gaoMap=gaoMap;
console.log("pipe", pipe);
this.dataListdetail.push(pipe);
......@@ -679,7 +686,7 @@ export default {
let device = this.form.deviceList[0];
console.log("device", device);
this.dataListdetail.push(device);
let gaoMap = new gaodeMap("石家庄",[device.longitude, device.latitude]);
let gaoMap = new gaodeMap(process.env.VUE_APP_MAP_CENTER,[device.longitude, device.latitude],"containerAlarm");
this.gaoMap = gaoMap;
this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, device);
......
gassafety-web/src/views/dataMonitoring/realtimedetail/index.vue
View file @ b619ccfa
......@@ -585,7 +585,7 @@
this.dataListdetail3.push(obj3);
this.form = response.data;
this.active = parseInt(response.data.orderStatus) + 1;
let gaoMap = new gaodeMap("石家庄",[this.form.longitude, this.form.latitude]);
let gaoMap = new gaodeMap(process.env.VUE_APP_MAP_CENTER,[this.form.longitude, this.form.latitude]);
this.gaoMap = gaoMap;
this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, this.form)
// this.gaoMap.resetMapCenter([this.form.longitude, this.form.latitude]);
......
gassafety-web/src/views/device/deviceInfoDetail/index.vue
View file @ b619ccfa
......@@ -313,7 +313,7 @@
console.log(this.form, "this.form")
const obj =this.form;
// this.gaoMap.resetMapCenter([this.form.longitude, this.form.latitude]);let obj = this.form.deviceList[0];
let gaoMap = new gaodeMap("石家庄", [obj.longitude, obj.latitude]);
let gaoMap = new gaodeMap(process.env.VUE_APP_MAP_CENTER, [obj.longitude, obj.latitude]);
this.gaoMap = gaoMap;
this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, this.form)
});
......
gassafety-web/src/views/device/map/index.vue
View file @ b619ccfa
......@@ -318,7 +318,7 @@ export default {
this.boxWidth = document.body.clientWidth - 100;
},
async initMap() {
let gaoMap = new gaodeMap("石家庄");
let gaoMap = new gaodeMap(process.env.VUE_APP_MAP_CENTER);
this.gaoMap = gaoMap;
this.gaoMap.view = this;
window.removeEventListener("click", this.barClose);
......
gassafety-web/src/views/device/pipeDetail/index.vue
View file @ b619ccfa
......@@ -270,7 +270,7 @@
const path1 = eval(coordinates)[0];
const path2 = eval(coordinates)[1];
const path3 = [(Number(path1[0]) + Number(path2[0])) / 2, (Number(path1[1]) + Number(path2[1])) / 2];
let gaoMap = new gaodeMap("石家庄", path3);
let gaoMap = new gaodeMap(process.env.VUE_APP_MAP_CENTER, path3);
this.gaoMap = gaoMap;
this.gaoMap.onlyLine(this.form);
});
......
gassafety-web/src/views/deviceInspection/inspectiondetail/index.vue
View file @ b619ccfa
......@@ -2,7 +2,7 @@
<div class="app-container detail inspectiondetail" style="background-color: rgb(238, 241, 245);">
<!-- 巡检计划信息 -->
<div style="padding-top: 10px;background: #fff;height: 100%;">
<el-row>
<el-row v-if="resourceId == undefined">
<el-col :span="24" style="padding-left: 15px;margin-bottom: -10px;">
<div style="height: 45px;" @click="$router.go(-1)">
<el-button size="medium" type="text" style="font-size: 18px; color: rgb(7, 63, 112);float: left;">返回
......@@ -87,7 +87,7 @@
</el-col>
<el-col :span="12">
<div id="marbox" style="width: 100%;height: 250px;margin-top: -25px; border: 1px solid rgb(218, 213, 213);">
<div style="width: 100%;height: 100%" id="container"></div>
<div style="width: 100%;height: 100%" id="containerInspect"></div>
</div>
</el-col>
</el-row>
......@@ -121,9 +121,10 @@
<el-col :span="6">
<el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="height: 30px;width: 100%;">
<el-form-item label="工单编号:" prop="orderId">
<!-- <font>{{form.orderId}}</font> -->
<!--&lt;!&ndash; <font>{{form.orderId}}</font> &ndash;&gt;-->
<template slot-scope="scope">
<el-button type="text" @click="showDetail(form.orderId)">{{form.orderId}}</el-button>
<font v-if="resourceId != undefined">{{form.orderId}}</font>
<el-button type="text" @click="showDetail(form.orderId)" v-if="resourceId == undefined">{{form.orderId}}</el-button>
</template>
</el-form-item>
</el-form>
......@@ -222,6 +223,7 @@
import { deviceNodeTree } from "@/api/device/deviceInfo";
export default {
props:["resourceId"],
name: "InspectionPlanDetail",
components: {
},
......@@ -326,7 +328,11 @@
// 如果是跳转来的，则接受初始化参数
// this.user_id = this.$route.query.id; //详细信息页接收参数
this.getList();
if(this.resourceId){
this.planId = this.resourceId;
}else{
this.planId = this.$route.query.planId;
}
// this.getDetail();
},
mounted() {
......@@ -365,7 +371,7 @@
// for (var i = 0; i < this.form.deviceList.length; i++) {
let obj = this.form.deviceList[0];
let gaoMap = new gaodeMap("石家庄", [obj.longitude, obj.latitude]);
let gaoMap = new gaodeMap(process.env.VUE_APP_MAP_CENTER, [obj.longitude, obj.latitude],"containerInspect");
this.gaoMap = gaoMap;
this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, obj)
// }
......@@ -376,7 +382,7 @@
const path1 = eval(coordinates)[0];
const path2 = eval(coordinates)[1];
const path3 = [(Number(path1[0]) + Number(path2[0])) / 2, (Number(path1[1]) + Number(path2[1])) / 2];
let gaoMap = new gaodeMap("石家庄", path3);
let gaoMap = new gaodeMap(process.env.VUE_APP_MAP_CENTER, path3,"containerInspect");
this.gaoMap = gaoMap;
for (var i = 0; i < this.form.pipeList.length; i++) {
let obj = this.form.pipeList[i];
......
gassafety-web/src/views/enterprise/mapView/index.vue
View file @ b619ccfa
......@@ -465,7 +465,7 @@ export default {
},
initMap() {
let gaoMap = new gaodeMap("石家庄");
let gaoMap = new gaodeMap(process.env.VUE_APP_MAP_CENTER);
this.gaoMap = gaoMap;
window.removeEventListener("mousedown", this.barClose);
window.addEventListener("mousedown", this.barClose);
......
gassafety-web/src/views/riskManagement/hiddenTroubleDetail/index.vue
View file @ b619ccfa
......@@ -2,7 +2,7 @@
<div class="app-container detail" style="background-color: rgb(238, 241, 245);">
<!-- 巡检计划信息 -->
<div style="padding-top: 10px;background: #fff;height: 100%;">
<el-row>
<el-row v-if="resourceId == undefined">
<el-col :span="24" style="padding-left: 15px;margin-bottom: -10px;">
<div style="height: 45px;" @click="$router.go(-1)">
<el-button size="medium" type="text" style="font-size: 18px; color: rgb(7, 63, 112);float: left;">返回
......@@ -254,7 +254,7 @@
<el-cascader
v-model="form1.device"
:options="options"
:props="props"
:props="propsH"
:show-all-levels="false"
@change="handleChange"
filterable
......@@ -349,6 +349,16 @@
@confirmFun="confirmFun($event)"
></Mapdialog>
</div>
<el-dialog
lock-scroll
:visible.sync="dialogVisible"
width="70%"
>
<div style="height:80vh;overflow:auto">
<workOrder :orderIdByHidden="form.orderId"/>
</div>
</el-dialog>
</div>
</div>
</template>
......@@ -361,15 +371,19 @@ import { inspectorList, allListUser } from "@/api/system/user";
import { deviceNodeTree } from "@/api/device/deviceInfo";
import MyFileUpload from '@/components/MyFileUpload';
import Mapdialog from "@/components/mapDialog/checkDeviceLoaction.vue";
import workOrder from "../../workOrder/detail/index.vue"
export default {
props:["resourceId"],
name: "HiddenTroubleDetail",
components: {
MyFileUpload,
Mapdialog
Mapdialog,
workOrder
},
data() {
return {
dialogVisible: false,
troubleId: '',
isDisplay:false,
showAndHide : false,
......@@ -380,7 +394,7 @@ export default {
// 用户列表
userList: [],
loadmap: false,
props: {
propsH: {
value: "id",
label: "name",
level: "level",
......@@ -453,7 +467,11 @@ export default {
this.getList();
// 如果是跳转来的，则接受初始化参数
if(this.resourceId){
this.troubleId = this.resourceId;
}else{
this.troubleId = this.$route.query.troubleId;
}
this.getDetail();
this.getDicts("t_trouble_type").then(response => {
this.typeOptions = response.data;
......@@ -481,12 +499,17 @@ export default {
},
/** 详细信息跳转 */
showDetail(orderId) {
this.$router.push({
/* this.$router.push({
path: '/workOrder/detail',
query:{
orderId : orderId
}
})
})*/
/*let routeData = this.$router.resolve({ path: '/workOrder/detail', query: { orderId: orderId } });
console.log(routeData,"trwetwe===========")
window.open(routeData.href, '_blank');*/
this.dialogVisible = true;
},
/** 提交按钮 */
submitForm1() {
......
gassafety-web/src/views/workOrder/detail/index.vue
View file @ b619ccfa
......@@ -4,7 +4,7 @@
<div style="padding-top: 10px;background: #fff;height: 100%;">
<el-row>
<el-col :span="24" style="padding-left: 15px;margin-bottom: -10px;">
<div style="height: 45px;" @click="$router.go(-1)">
<div v-if="orderIdByHidden == undefined" style="height: 45px;" @click="$router.go(-1)">
<el-button size="medium" type="text" style="font-size: 18px; color: rgb(7, 63, 112);float: left;">返回
</el-button>
<div style="float: left;margin-top: 8px;margin-left: 5px;"><img src="../../../assets/logo/fanhui.png"
......@@ -46,9 +46,9 @@
<el-col :span="6">
<el-form ref="form" v-model="form" :rules="rules" style="width: 100%;">
<el-form-item label="工单类型:" prop="orderType" style="margin-bottom: 0px;">
<font v-if="form.orderType == 1">巡检信息</font>
<font v-if="form.orderType == 2">隐患信息</font>
<font v-if="form.orderType == 3">报警信息</font>
<el-button type="text" v-if="form.orderType == 1" @click="detailInfos(form.orderType)">巡检信息</el-button>
<el-button type="text" v-if="form.orderType == 2" @click="detailInfos(form.orderType)">隐患信息</el-button>
<el-button type="text" v-if="form.orderType == 3" @click="detailInfos(form.orderType)">报警信息</el-button>
</el-form-item>
<el-form-item label="工单编号:" prop="orderId" style="margin-bottom: 0px;">
<font>{{form.orderId}}</font>
......@@ -250,9 +250,9 @@
<div class="" style="width: 95%;margin-left: 50px;text-align: center;margin-top: 10px;">
<el-button style="margin-bottom: 15px;margin-top: 10px;" type="primary" size="normal" icon="el-icon-edit" @click="handleUpdate(form.orderId)"
v-hasPermi="['workOrder:basicsInfo:edit']" v-if="form.orderStatus == 0">修改</el-button>
v-hasPermi="['workOrder:basicsInfo:edit']" v-if="form.orderStatus == 0 && orderIdByHidden == undefined">修改</el-button>
<el-button style="margin-bottom: 15px;margin-top: 10px;" type="primary" size="normal" icon="el-icon-edit" @click="handleFinish(form.orderId)"
v-hasPermi="['workOrder:basicsInfo:editStatus']" v-if="form.orderStatus == 2">归档</el-button>
v-hasPermi="['workOrder:basicsInfo:editStatus']" v-if="form.orderStatus == 2 && orderIdByHidden == undefined">归档</el-button>
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<div v-if="this.title == '工单信息修改'">
......@@ -294,6 +294,35 @@
</el-dialog>
</div>
</div>
<el-dialog
lock-scroll
:visible.sync="inspectionDialogVisible"
width="70%"
>
<div style="height:80vh;overflow:auto">
<inspection :resourceId="form.resourceId"/>
</div>
</el-dialog>
<el-dialog
lock-scroll
:visible.sync="hiddenTroubleDialogVisible"
width="70%"
>
<div style="height:80vh;overflow:auto">
<hiddenTrouble :resourceId="form.resourceId"/>
</div>
</el-dialog>
<el-dialog
lock-scroll
:visible.sync="alarmDialogVisible"
width="70%"
>
<div style="height:80vh;overflow:auto">
<alarm :resourceId="form.resourceId"/>
</div>
</el-dialog>
</div>
</template>
......@@ -304,13 +333,23 @@
import gaodeMap from "utils/gaodeMap.js";
import { map, DEVICE_TYPE } from "utils/gaodeMap.js";
import { inspectorList } from "@/api/system/user";
import inspection from "../../deviceInspection/inspectiondetail/index.vue";
import hiddenTrouble from "../../riskManagement/hiddenTroubleDetail/index.vue";
import alarm from "../../dataMonitoring/alarmdetail/index.vue";
export default {
props:["orderIdByHidden"],
name: "BasicsInfo",
components: {
inspection,
hiddenTrouble,
alarm
},
data() {
return {
inspectionDialogVisible: false,
hiddenTroubleDialogVisible: false,
alarmDialogVisible: false,
inspector: [],
isDisplay: false,
dialogImageUrl: '',
......@@ -381,7 +420,12 @@
created() {
// 如果是跳转来的，则接受初始化参数
// this.user_id = this.$route.query.id; //详细信息页接收参数
if(this.orderIdByHidden){
this.orderId = this.orderIdByHidden;
}else{
this.orderId = this.$route.query.orderId;
}
this.getList();
this.getDicts("t_order_status").then(response => {
this.typeOptions = response.data;
......@@ -392,7 +436,6 @@
// this.getBasicsInfo();
},
mounted() {
this.getBasicsInfo();
},
methods: {
......@@ -455,7 +498,7 @@
if (this.form.deviceInfoList.length > 0) {
console.log("this.form.deviceInfoList", this.form.deviceInfoList)
let gaoMap = new gaodeMap("石家庄", [this.form.deviceInfoList[0].longitude, this.form.deviceInfoList[0].latitude]);
let gaoMap = new gaodeMap(process.env.VUE_APP_MAP_CENTER, [this.form.deviceInfoList[0].longitude, this.form.deviceInfoList[0].latitude]);
this.gaoMap = gaoMap;
// this.gaoMap.resetMapCenter([this.form.deviceInfoList[0].longitude, this.form.deviceInfoList[0].latitude]);
for (var i = 0; i < this.form.deviceInfoList.length; i++) {
......@@ -470,7 +513,7 @@
const path1 = eval(coordinates)[0];
const path2 = eval(coordinates)[1];
const path3 = [(Number(path1[0]) + Number(path2[0])) / 2, (Number(path1[1]) + Number(path2[1])) / 2];
let gaoMap = new gaodeMap("石家庄",path3);
let gaoMap = new gaodeMap(process.env.VUE_APP_MAP_CENTER,path3);
this.gaoMap = gaoMap;
for (var i = 0; i < this.form.pipeList.length; i++) {
......@@ -613,6 +656,17 @@
this.download(response.msg);
this.exportLoading = false;
}).catch(() => { });
},
detailInfos(type){
if("1" == type){
this.inspectionDialogVisible = true;
}
if("2" == type){
this.hiddenTroubleDialogVisible = true;
}
if("3" == type){
this.alarmDialogVisible = true;
}
}
}
}
......
gassafety-web/src/views/workOrder/feedbackdetail/index.vue
View file @ b619ccfa
......@@ -371,7 +371,7 @@ export default {
this.getBasicsInfo();
},
mounted(){
let gaoMap = new gaodeMap("石家庄");
let gaoMap = new gaodeMap(process.env.VUE_APP_MAP_CENTER);
this.gaoMap = gaoMap;
this.getBasicsInfo();
},
......
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