Skip to content

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

Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety

parents 7b595fb5 bb91ed7c
Hide whitespace changes
Inline Side-by-side
Showing with 201 additions and 47 deletions
gassafety-web/src/components/FileUpload/index.vue
View file @ f4a0802f
......@@ -71,12 +71,13 @@
// 文件类型, 例如['png', 'jpg', 'jpeg']
fileType: {
type: Array,
default: () => ["doc", "xls", "ppt", "txt", "pdf", "png", "jpg", "jpeg"],
// default: () => ["doc", "xls", "ppt", "txt", "pdf", "png", "jpg", "jpeg"],
default: () => ["png", "jpg", "jpeg", "gif"],
},
// 是否显示提示
isShowTip: {
type: Boolean,
default: false,
default: true,
},
},
data() {
......
gassafety-web/src/components/MyFileUpload/index.vue
View file @ f4a0802f
......@@ -32,7 +32,7 @@
</template>
的文件
</div>
</el-upload>
<el-image v-show="false"
id="img"
......@@ -87,12 +87,13 @@ export default {
// 文件类型, 例如['png', 'jpg', 'jpeg']
fileType: {
type: Array,
default: () => ["doc", "xls", "ppt", "txt", "pdf", "png", "jpg", "jpeg"],
// default: () => ["doc", "xls", "ppt", "txt", "pdf", "png", "jpg", "jpeg"],
default: () => ["png", "jpg", "jpeg", "gif"],
},
// 是否显示提示
isShowTip: {
type: Boolean,
default: false,
default: true,
},
},
data() {
......
gassafety-web/src/components/PopWindow/flowMeter.vue
View file @ f4a0802f
......@@ -151,6 +151,7 @@ export default {
return {
form: {
deviceType: "3",
iconUrl:"",
},
type: DEVICE_TYPE.FLOWMETER,
dialogVisible: false,
......
gassafety-web/src/components/PopWindow/pipelineView.vue
View file @ f4a0802f
......@@ -3,6 +3,7 @@
:title="myTitle"
:visible.sync="dialogVisible"
:before-close="handleClose"
ref="dialog"
>
<el-row>
<el-form
......@@ -146,7 +147,7 @@
<el-button :loading="okLoading" type="primary" @click="ok"
>确 定</el-button
>
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button @click="handleCloseBtn">取 消</el-button>
</span>
</el-dialog>
</template>
......@@ -271,14 +272,19 @@ export default {
if (res.code == 200) {
this.dialogVisible = false;
data.pipeId = data.pipeId ? data.pipeId : res.data;
this.lineOkCallBack.call(this.gaodeMap, this.target, data,()=>{
const arr= this.gaodeMap.polyLines.map(item=>{
return item.getExtData().lineData
})
console.log("arr===================",arr)
this.gaodeMap.view.pipeClassify(arr)
this.gaodeMap.view.pipeList();
});
this.lineOkCallBack.call(
this.gaodeMap,
this.target,
data,
() => {
const arr = this.gaodeMap.polyLines.map((item) => {
return item.getExtData().lineData;
});
console.log("arr===================", arr);
this.gaodeMap.view.pipeClassify(arr);
this.gaodeMap.view.pipeList();
}
);
if (!this.editForm.pipeId) {
this.gaodeMap.newLineObj = null;
this.gaodeMap.createNewLine();
......@@ -321,7 +327,9 @@ export default {
options.lineData = { ...this.editForm };
this.target.setExtData(options);
// 把值带出去
done();
if (done) {
done();
}
// this.$confirm("确认关闭？")
// .then((_) => {
......@@ -329,6 +337,10 @@ export default {
// })
// .catch((_) => {});
},
handleCloseBtn() {
this.handleClose();
this.dialogVisible = false;
},
// 图片上传成功
fileFinshed(e) {
this.editForm.iconUrl = e.url;
......
gassafety-web/src/components/PopWindow/pressureGage.vue
View file @ f4a0802f
......@@ -151,6 +151,8 @@ export default {
return {
form: {
deviceType: "4",
iconUrl:"",
},
type: DEVICE_TYPE.PRESSUREGAGE,
dialogVisible: false,
......
gassafety-web/src/components/PopWindow/regulatorBox.vue
View file @ f4a0802f
......@@ -151,6 +151,8 @@ export default {
return {
form: {
deviceType: "1",
iconUrl:"",
},
type: DEVICE_TYPE.REGEULATORBOX,
dialogVisible: false,
......
gassafety-web/src/components/PopWindow/valveWell.vue
View file @ f4a0802f
......@@ -150,6 +150,7 @@ export default {
return {
form: {
deviceType: "2",
iconUrl:"",
},
type: DEVICE_TYPE.VALUEWELL,
dialogVisible: false,
......
gassafety-web/src/components/PopWindowGis/lineInfoWindow.vue
View file @ f4a0802f
......@@ -134,9 +134,10 @@ export default {
deviceMore() {
console.log(this.obj.polyline.getExtData().lineData);
this.obj.polyline.getExtData().class.view.$router.push({
path: "/dataMonitoring/realtimedetail",
// path: "/dataMonitoring/realtimedetail",
path: "/device/pipeDetail",
query: {
deviceId: this.obj.polyline.getExtData().lineData.pipeId,
pipeId: this.obj.polyline.getExtData().lineData.pipeId,
//这里是传数字
deviceType: "0",
},
......
gassafety-web/src/components/PopWindowGis/markerInfoWindow.vue
View file @ f4a0802f
......@@ -87,10 +87,11 @@ export default {
moment,
deviceMore() {
this.data.class.view.$router.push({
path: "/dataMonitoring/realtimedetail",
// path: "/dataMonitoring/realtimedetail",
path: "/device/deviceInfoDetail",
query: {
deviceId: this.data.deviceId,
deviceType: this.data.deviceType,
// deviceType: this.data.deviceType,
},
});
},
......
gassafety-web/src/components/TopNav/index.vue
View file @ f4a0802f
......@@ -7,7 +7,6 @@
<template v-for="(item, index) in topMenus">
<!-- <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber" -->
<el-menu-item
:style=""
:index="item.path"
:key="index"
v-if="index < visibleNumber"
......@@ -22,7 +21,7 @@
<!-- 顶部菜单超出数量折叠 -->
<!-- <div> -->
<el-submenu
class="onlyNavTio"
class="onlyNavTio moreLise"
index="more"
v-if="topMenus.length > visibleNumber"
>
......@@ -308,4 +307,20 @@ export default {
color: rgb(5 59 106) !important;
font-weight: 900 !important;
}
.moreLise {
// background-image: url("../../assets/logo/item-background.png") !important;
// background-size: 100% 123% !important;
&.is-active {
// background-image: url("../../assets/logo/item-background.png") !important;
background-size: 100% 123% !important;
}
.el-submenu__title {
background-image: none !important;
}
&:hover {
background-image: url("../../assets/logo/item-background.png");
background-size: 100% 123%;
}
// height: 100px;
}
</style>
gassafety-web/src/views/dataMonitoring/alarmdetail/index.vue
View file @ f4a0802f
......@@ -11,7 +11,14 @@
</el-col>
</el-row>
<el-row style="width: 100%;height: 45px;">
<el-col :span="24">
<div style="">
<ul><li style="list-style: none;font-weight: 900;font-size: 20px;color: #053b6a;">报警信息管理详情</li></ul>
</div>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row style="padding-left: 50px;">
<el-col :span="6">
<el-form ref="form" v-model="form" style="width: 100%;">
......@@ -64,7 +71,13 @@
</el-col>
</el-row>
<el-divider></el-divider>
<el-row style="width: 100%;height: 45px;">
<el-col :span="24">
<div style="color: #31EAEA;">
<ul><li>设备详情</li></ul>
</div>
</el-col>
</el-row>
<el-row>
<el-col :span="16" style="padding: 10px;">
<div style="width: 100%;float: left;height: 100%;" v-if="form.deviceType != '管道'">
......
gassafety-web/src/views/dataMonitoring/realtimedetail/index.vue
View file @ f4a0802f
......@@ -11,7 +11,13 @@
</div>
</el-col>
</el-row>
<el-row style="width: 100%;height: 45px;">
<el-col :span="24">
<div style="">
<ul><li style="list-style: none;font-weight: 900;font-size: 20px;color: #053b6a;">实时数据详情</li></ul>
</div>
</el-col>
</el-row>
<el-row>
<el-col :span="16" style="padding: 10px;">
<div style="height: 100%;">
......
gassafety-web/src/views/device/deviceInfo/index.vue
View file @ f4a0802f
......@@ -353,9 +353,6 @@
form: {},
// 表单校验
rules: {
pipeId: [
{ required: true, message: "请选择所属管道", trigger: "blur" },
],
deviceType: [
{ required: true, message: "请选择设备类型", trigger: "blur" },
],
......
gassafety-web/src/views/device/deviceInfoDetail/index.vue
View file @ f4a0802f
......@@ -10,7 +10,13 @@
</div>
</el-col>
</el-row>
<el-row style="width: 100%;height: 45px;">
<el-col :span="24">
<div style="">
<ul><li style="list-style: none;font-weight: 900;font-size: 20px;color: #053b6a;">设备信息管理详情</li></ul>
</div>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row style="width: 100%;">
<el-col :span="24">
......@@ -22,7 +28,7 @@
<el-row style="width: 100%;padding: 10px;padding-left: 40px;">
<el-col :span="5">
<el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="width: 100%;">
<el-form ref="form" v-model="form" label-width="100px" style="width: 100%;">
<el-form-item label="设备名称:" prop="deviceName">
<font>{{form.deviceName}}</font>
</el-form-item>
......@@ -38,6 +44,9 @@
<el-form-item label="设备型号:" prop="deviceModel">
<font>{{form.deviceModel}}</font>
</el-form-item>
<el-form-item label="所属管道:" prop="pipeName">
<font>{{form.pipeName}}</font>
</el-form-item>
<el-form-item label="物联网编号:" prop="iotNo">
<font>{{form.iotNo}}</font>
</el-form-item>
......@@ -47,16 +56,13 @@
<el-form-item label="联系电话:" prop="phone">
<font>{{form.phone}}</font>
</el-form-item>
<el-form-item label="备注信息:" prop="remarks">
<el-form-item label="备注信息:" prop="remarks" style="width: 170%;">
<font>{{form.remarks}}</font>
</el-form-item>
</el-form>
</el-col>
<el-col :span="6">
<el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="width: 100%;">
<el-form-item label="所属管道:" prop="pipeName">
<font>{{form.pipeName}}</font>
</el-form-item>
<el-form ref="form" v-model="form" label-width="100px" style="width: 100%;">
<el-form-item label="所在地址:" prop="deviceAddr">
<font>{{form.deviceAddr}}</font>
</el-form-item>
......@@ -283,7 +289,42 @@
form: { },
editForm: {},
// 表单校验
rules: { }
rules: {
deviceType: [
{ required: true, message: "请选择设备类型", trigger: "blur" },
],
deviceName: [
{ required: true, message: "请输入设备名称", trigger: "blur" },
],
deviceCode: [
{ required: true, message: "请输入设备编号", trigger: "blur" },
],
deviceModel: [
{ required: true, message: "请输入设备型号", trigger: "blur" },
],
deviceAddr: [
{ required: true, message: "请输入所在地址", trigger: "blur" },
],
longitude: [
{ required: true, message: "请输入经纬度", trigger: "blur" },
],
iotNo: [
{ required: true, message: "请输入物联网编号", trigger: "blur" },
],
linkman: [
{ required: true, message: "请输入联系人", trigger: "blur" }
],
phone: [
{ required: true, message: "请输入联系电话", trigger: "blur" },
{ min: 11, max: 11, message: "长度11个数字", trigger: "blur" },
],
iconUrl: [
{ required: true, message: "请上传图片", trigger: "change" }
],
installationTime: [
{ required: true, message: "请选择日期", trigger: "change" },
],
}
};
},
created() {
......@@ -302,6 +343,7 @@
getDetail (){
getDeviceInfo(this.deviceId).then(response =>{
this.form = response.data;
console.log(this.form,"this.form")
this.gaoMap.resetMapCenter([this.form.longitude, this.form.latitude]);
this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, this.form)
});
......
gassafety-web/src/views/device/pipeDetail/index.vue
View file @ f4a0802f
......@@ -10,7 +10,13 @@
</div>
</el-col>
</el-row>
<el-row style="width: 100%;height: 45px;">
<el-col :span="24">
<div style="">
<ul><li style="list-style: none;font-weight: 900;font-size: 20px;color: #053b6a;">管道管理详情</li></ul>
</div>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row style="width: 100%;">
......@@ -22,7 +28,7 @@
</el-row>
<el-row style="width: 100%;padding: 10px;padding-left: 40px;">
<el-col :span="5">
<el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="width: 100%;">
<el-form ref="form" v-model="form" label-width="100px" style="width: 100%;">
<el-form-item label="管道名称:" prop="pipeName">
<font>{{form.pipeName}}</font>
</el-form-item>
......@@ -42,13 +48,13 @@
<el-form-item label="管道长度:" prop="pipeLength">
<font>{{form.pipeLength}}</font>
</el-form-item>
<el-form-item label="备注信息:" prop="remarks">
<el-form-item label="备注信息:" prop="remarks" style="width: 170%;">
<font>{{form.remarks}}</font>
</el-form-item>
</el-form>
</el-col>
<el-col :span="6">
<el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="width: 100%;">
<el-form ref="form" v-model="form" label-width="100px" style="width: 100%;">
<el-form-item label="管道地址:" prop="pipeAddr">
<font>{{form.pipeAddr}}</font>
</el-form-item>
......@@ -229,7 +235,35 @@
editForm: {
},
// 表单校验
rules: { }
rules: {
pipeName: [
{ required: true, message: "请输入管道名称", trigger: "blur" },
],
pipeCode: [
{ required: true, message: "请输入管道编号", trigger: "blur" },
],
pipeLength: [
{ required: true, message: "请输入管道长度", trigger: "blur" },
],
pipeAddr: [
{ required: true, message: "请输入管道所在地址", trigger: "blur" },
],
pipeType: [
{ required: true, message: "请选择管道类型", trigger: "blur" },
],
pipePressure: [
{ required: true, message: "请选择管道压力", trigger: "blur" },
],
coordinates: [
{ required: true, message: "请选择管道坐标", trigger: "blur" },
],
iconUrl: [
{ required: true, message: "请上传图片", trigger: "change" },
],
installationTime: [
{ required: true, message: "请选择日期", trigger: "change" },
],
}
};
},
created() {
......
gassafety-web/src/views/deviceInspection/inspectiondetail/index.vue
View file @ f4a0802f
......@@ -11,6 +11,13 @@
</div>
</el-col>
</el-row>
<el-row style="width: 100%;height: 45px;">
<el-col :span="24">
<div style="">
<ul><li style="list-style: none;font-weight: 900;font-size: 20px;color: #053b6a;">设备巡检详情</li></ul>
</div>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row style="width: 100%;">
......@@ -31,10 +38,8 @@
<el-form-item label="检测地点:" prop="address">
<font>{{form.address}}</font>
</el-form-item>
<el-form-item label="计划描述:" prop="remarks">
<div style="height: 90px;width: 200%; border: 1px solid rgb(187, 183, 183);margin-top: 10px;overflow-y: auto;padding: 5px;border-radius: 5px;">
<font>{{form.remarks}}</font>
</div>
<el-form-item label="计划描述:" prop="remarks" style="width: 170%;">
<font>{{form.remarks}}</font>
</el-form-item>
</el-form>
</el-col>
......
gassafety-web/src/views/riskManagement/hiddenTroubleDetail/index.vue
View file @ f4a0802f
......@@ -11,6 +11,13 @@
</div>
</el-col>
</el-row>
<el-row style="width: 100%;height: 45px;">
<el-col :span="24">
<div style="">
<ul><li style="list-style: none;font-weight: 900;font-size: 20px;color: #053b6a;">隐患管理详情</li></ul>
</div>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row style="width: 100%;">
......
gassafety-web/src/views/workOrder/detail/index.vue
View file @ f4a0802f
......@@ -11,7 +11,13 @@
</div>
</el-col>
</el-row>
<el-row style="width: 100%;height: 45px;">
<el-col :span="24">
<div style="">
<ul><li style="list-style: none;font-weight: 900;font-size: 20px;color: #053b6a;">工单基础信息详情</li></ul>
</div>
</el-col>
</el-row>
<el-steps :active="active" finish-status="success" simple prop="orderStatus" style="margin-top: 5px">
<el-step title="未接收" ></el-step>
<el-step title="已接收" ></el-step>
......@@ -54,7 +60,7 @@
<el-form-item label="指定执行人员:" prop="appointInspectorName" style="margin-bottom: 0px;">
<font>{{form.appointInspectorName}}</font>
</el-form-item>
<el-form-item label="工单描述:" prop="remarks" style="margin-bottom: 0px;">
<el-form-item label="工单描述:" prop="remarks" style="margin-bottom: 0px;width: 170%;">
<font>{{form.remarks}}</font>
</el-form-item>
</el-form>
......
gassafety-web/src/views/workOrder/feedbackdetail/index.vue
View file @ f4a0802f
......@@ -10,6 +10,13 @@
<div style="float: left;margin-top: 8px;margin-left: 5px;"><img src="../../../assets/logo/fanhui.png" style="width: 25px;" alt=""></div>
</div>
</el-col>
</el-row>
<el-row style="width: 100%;height: 45px;">
<el-col :span="24">
<div style="">
<ul><li style="list-style: none;font-weight: 900;font-size: 20px;color: #053b6a;">工单反馈详情</li></ul>
</div>
</el-col>
</el-row>
<el-steps :active="active" finish-status="success" simple prop="orderStatus" style="margin-top: 5px">
<el-step title="未接收" ></el-step>
......@@ -50,7 +57,7 @@
<el-form-item label="指定执行人员:" prop="appointInspectorName">
<font>{{form.appointInspectorName}}</font>
</el-form-item>
<el-form-item label="工单描述:" prop="remarks">
<el-form-item label="工单描述:" prop="remarks" style="width: 170%;">
<font>{{form.remarks}}</font>
</el-form-item>
</el-form>
......
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