Skip to content

G
gassafety
Commit c5b82d84 authored by jianqian's avatar jianqian
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents d1f2aeee e369de19
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 286 additions and 120 deletions
gassafety-web/.env.development
View file @ c5b82d84
......@@ -4,6 +4,11 @@ ENV = 'development'
# 燃气安全管理系统/开发环境
VUE_APP_BASE_API = '/dev-api'
#地图中心
VUE_APP_MAP_CENTER = '石家庄'
#代理地址
VUE_APP_TARGET = 'http://36.148.23.59:8901/gassafety'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
gassafety-web/.env.production
View file @ c5b82d84
......@@ -4,4 +4,10 @@ ENV = 'production'
# 燃气安全管理系统/生产环境
VUE_APP_BASE_API = '/prod-api'
#地图中心
VUE_APP_MAP_CENTER = '石家庄'
#代理地址
VUE_APP_TARGET = 'http://36.148.23.59:8901/gassafety'
port = 8091
gassafety-web/src/components/mapDialog/checkPipeLineLocation.vue
View file @ c5b82d84
......@@ -50,7 +50,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 @ c5b82d84
......@@ -43,10 +43,11 @@ class gaodeMap {
leftListClick = false;
//构造函数中设置中央点默认值
constructor(center, latlng) {
constructor(center, latlng,containerId) {
let container = containerId ? containerId : "container";
this.markers = [];
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,
......@@ -234,7 +235,8 @@ class gaodeMap {
this.setMarkerIcon(marker);
if (
DEVICE_TYPE.WORKORDER != markerType &&
DEVICE_TYPE.INSPECTOR != markerType
DEVICE_TYPE.INSPECTOR != markerType &&
func != "false"
) {
marker.content = this.getMarketContent(data);
marker.on("mouseover", this.infoOpen);
......@@ -349,7 +351,9 @@ class gaodeMap {
//infoWindow.close(map, e.target.getPosition());
}
if (func) {
func();
if(func != "false"){
func();
}
}
}
// 其他设备
......
gassafety-web/src/views/dataMonitoring/alarmdetail/index.vue
View file @ c5b82d84
<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>
......@@ -235,6 +236,16 @@
</el-dialog>
</div>
</div>
<el-dialog
title = "工单信息"
lock-scroll
:visible.sync="dialogVisible"
width="70%"
>
<div style="height:80vh;overflow:auto">
<workOrder :linkOrderId="form.orderId"/>
</div>
</el-dialog>
</div>
</template>
......@@ -247,13 +258,17 @@
import { map, DEVICE_TYPE } from "utils/gaodeMap.js";
import { inspectorList } from "@/api/system/user";
import echarts from 'echarts';
import workOrder from "../../workOrder/detail/index.vue"
export default {
props:["resourceId"],
name: "DeviceAlarm",
components: {
workOrder
},
data() {
return {
dialogVisible: false,
dataListdetail: [],
alarmId:'',
// 折线图标题
......@@ -277,7 +292,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() {
......@@ -649,12 +669,13 @@ export default {
},
/** 详细信息跳转 */
showDetail(orderId) {
this.$router.push({
/*this.$router.push({
path: '/workOrder/detail',
query:{
orderId : orderId
}
}) //带参跳转
}) //带参跳转*/
this.dialogVisible = true;
},
getDetail (){
getDeviceAlarm(this.alarmId).then(response =>{
......@@ -668,7 +689,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 +700,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 @ c5b82d84
......@@ -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 @ c5b82d84
......@@ -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 @ c5b82d84
......@@ -341,7 +341,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/pipe/index.vue
View file @ c5b82d84
......@@ -479,21 +479,27 @@
handleDelete(row) {
row.isDel = "1";
var devices = " ";
for(var i = 0; i < row.deviceInfoList.length; i++){
var obj = row.deviceInfoList[i];
devices = devices + obj.deviceName + " ";
var tip = '';
if (row.deviceInfoList != null){
for(var i = 0; i < row.deviceInfoList.length; i++){
var obj = row.deviceInfoList[i];
devices = devices + obj.deviceName + " ";
}
tip = '请确认是否删除管道名称为"' + row.pipeName + '"的数据项，该管道下包含的设备（' + devices + '）将一并被删除', "警告"
}else{
tip ='请确认是否删除管道名称为"' + row.pipeName + '"的数据项';
}
this.$confirm('请确认是否删除管道名称为"' + row.pipeName + '"的数据项，该管道下包含的设备（' + devices + '）将一并被删除', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function () {
return updatePipe(row);
}).then(() => {
this.getList();
this.msgSuccess("已删除");
}).catch(() => {
});
this.$confirm(tip , {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function () {
return updatePipe(row);
}).then(() => {
this.getList();
this.msgSuccess("已删除");
}).catch(() => {
});
},
/** 导出按钮操作 */
handleExport() {
......
gassafety-web/src/views/device/pipeDetail/index.vue
View file @ c5b82d84
......@@ -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);
});
......@@ -332,11 +332,18 @@
handleDelete(res) {
res.isDel = "1";
var devices = " ";
for (var i = 0; i < res.deviceInfoList.length; i++) {
var obj = res.deviceInfoList[i];
devices = devices + obj.deviceName + " ";
var tip = '';
if(res.deviceInfoList != null){
for (var i = 0; i < res.deviceInfoList.length; i++) {
var obj = res.deviceInfoList[i];
devices = devices + obj.deviceName + " ";
}
tip = '该管道下包含的设备（' + devices + '）将一并被删除', "警告"
}else{
tip = '请确认是否删除管道名称为"' + res.pipeName + '"的数据项'
}
this.$confirm('请确认是否删除管道名称为"' + res.pipeName + '"的数据项，该管道下包含的设备（' + devices + '）将一并被删除', "警告", {
this.$confirm(tip, {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
......
gassafety-web/src/views/deviceInspection/inspectiondetail/index.vue
View file @ c5b82d84
......@@ -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>
......@@ -208,6 +209,17 @@
</el-dialog>
</div>
</div>
<el-dialog
title = "工单信息"
lock-scroll
:visible.sync="dialogVisible"
width="70%"
>
<div style="height:80vh;overflow:auto">
<workOrder :linkOrderId="form.orderId"/>
</div>
</el-dialog>
</div>
</template>
......@@ -220,13 +232,17 @@
import { inspectorList } from "@/api/system/user";
import { deviceTree } from "@/api/device/deviceInfo";
import { deviceNodeTree } from "@/api/device/deviceInfo";
import workOrder from "../../workOrder/detail/index.vue"
export default {
props:["resourceId"],
name: "InspectionPlanDetail",
components: {
workOrder
},
data() {
return {
dialogVisible: false,
// 遮罩层
loading: true,
// 导出遮罩层
......@@ -326,7 +342,11 @@
// 如果是跳转来的，则接受初始化参数
// this.user_id = this.$route.query.id; //详细信息页接收参数
this.getList();
this.planId = this.$route.query.planId;
if(this.resourceId){
this.planId = this.resourceId;
}else{
this.planId = this.$route.query.planId;
}
// this.getDetail();
},
mounted() {
......@@ -361,13 +381,24 @@
console.log("this.form", this.form)
this.active = parseInt(response.data.orderStatus) + 1;
if (this.form.deviceList?.length > 0) {
// 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)
if("1" == obj.deviceType){
this.gaoMap.addMarker(DEVICE_TYPE.REGEULATORBOX, obj,"false")
}
if("2" == obj.deviceType){
this.gaoMap.addMarker(DEVICE_TYPE.VALUEWELL, obj,"false")
}
if("3" == obj.deviceType){
this.gaoMap.addMarker(DEVICE_TYPE.FLOWMETER, obj,"false")
}
if("4" == obj.deviceType){
this.gaoMap.addMarker(DEVICE_TYPE.PRESSUREGAGE, obj,"false")
}
// }
}
......@@ -376,7 +407,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];
......@@ -534,12 +565,13 @@
},
/** 详细信息跳转 */
showDetail(orderId) {
this.$router.push({
/*this.$router.push({
path: '/workOrder/detail',
query: {
orderId: orderId
}
}) //带参跳转
}) //带参跳转*/
this.dialogVisible = true;
},
/** 归档按钮操作 */
handleFinish(res) {
......@@ -635,4 +667,4 @@
font-size: 15px;
font-weight: 900;
}
</style>
\ No newline at end of file
</style>
gassafety-web/src/views/enterprise/mapView/index.vue
View file @ c5b82d84
......@@ -477,7 +477,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 @ c5b82d84
......@@ -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;">返回
......@@ -104,7 +104,8 @@
<el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="height: 30px;width: 100%;">
<el-form-item label="工单编号:" prop="orderId">
<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>
......@@ -254,7 +255,7 @@
<el-cascader
v-model="form1.device"
:options="options"
:props="props"
:props="propsH"
:show-all-levels="false"
@change="handleChange"
filterable
......@@ -349,6 +350,17 @@
@confirmFun="confirmFun($event)"
></Mapdialog>
</div>
<el-dialog
title = "工单信息"
lock-scroll
:visible.sync="dialogVisible"
width="70%"
>
<div style="height:80vh;overflow:auto">
<workOrder :linkOrderId="form.orderId"/>
</div>
</el-dialog>
</div>
</div>
</template>
......@@ -361,15 +373,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 +396,7 @@ export default {
// 用户列表
userList: [],
loadmap: false,
props: {
propsH: {
value: "id",
label: "name",
level: "level",
......@@ -450,10 +466,14 @@ export default {
};
},
created() {
this.getList();
// 如果是跳转来的，则接受初始化参数
this.troubleId = this.$route.query.troubleId;
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 +501,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() {
......@@ -621,8 +646,8 @@ export default {
this.showAndHide = false;
}
},
// 表单重置
reset() {
this.form1 = {
......
gassafety-web/src/views/workOrder/feedbackdetail/index.vue
View file @ c5b82d84
......@@ -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();
},
......
gassafety-web/vue.config.js
View file @ c5b82d84
......@@ -34,7 +34,7 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `http://36.148.23.59:8901/gassafety`,
target: `http://36.148.23.59:8901/gassafety`,
target: process.env.VUE_APP_TARGET,
changeOrigin: true,
pathRewrite: {
["^" + process.env.VUE_APP_BASE_API]: ""
......
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