Skip to content

G
gassafety
Commit 30f5d6c6 authored by 纪泽龙's avatar 纪泽龙
Browse files
Options

合并jzl

parents eb14dc93 5ef0a2b9
Hide whitespace changes
Inline Side-by-side
Showing with 287 additions and 159 deletions
gassafety-web/src/assets/styles/gassafety.scss
View file @ 30f5d6c6
...@@ -266,3 +266,9 @@ ...@@ -266,3 +266,9 @@
position: relative; position: relative;
float: right; float: right;
} }
// 上传按钮
.hide {
.el-upload--picture-card {
display: none;
}
}
gassafety-web/src/assets/styles/sidebar.scss
View file @ 30f5d6c6
...@@ -118,11 +118,11 @@ ...@@ -118,11 +118,11 @@
.hideSidebar { .hideSidebar {
.sidebar-container { .sidebar-container {
width: 54px !important; // width: 54px !important;
} }
.main-container { .main-container {
margin-left: 54px; // margin-left: 54px;
} }
.submenu-title-noDropdown { .submenu-title-noDropdown {
......
gassafety-web/src/components/MyFileUpload/index.vue
View file @ 30f5d6c6
...@@ -11,9 +11,11 @@ ...@@ -11,9 +11,11 @@
:on-success="handleUploadSuccess" :on-success="handleUploadSuccess"
:on-remove="handleRemove" :on-remove="handleRemove"
:on-preview="handleFileClick" :on-preview="handleFileClick"
:on-change="fileChange"
:show-file-list="true" :show-file-list="true"
:headers="headers" :headers="headers"
class="upload-file-uploader" class="upload-file-uploader"
:class="{hide:addShow}"
ref="upload" ref="upload"
> >
<!-- 上传按钮 --> <!-- 上传按钮 -->
...@@ -78,6 +80,7 @@ export default { ...@@ -78,6 +80,7 @@ export default {
type: Boolean, type: Boolean,
default: false, default: false,
}, },
}, },
data() { data() {
return { return {
...@@ -89,6 +92,7 @@ export default { ...@@ -89,6 +92,7 @@ export default {
modal:false, modal:false,
dialogVisible:false, dialogVisible:false,
dialogImageUrl:"", dialogImageUrl:"",
addShow:true,
}; };
}, },
computed: { computed: {
...@@ -163,6 +167,7 @@ export default { ...@@ -163,6 +167,7 @@ export default {
// 文件列表移除文件 // 文件列表移除文件
handleRemove(file, fileList) { handleRemove(file, fileList) {
console.log("列表移除", file, fileList); console.log("列表移除", file, fileList);
this.addShow = fileList.length>0 ?true:false;
this.$emit("remove", file); this.$emit("remove", file);
}, },
// 删除文件 // 删除文件
...@@ -197,9 +202,15 @@ export default { ...@@ -197,9 +202,15 @@ export default {
return ""; return "";
} }
}, },
// 当改变列表改变时
fileChange(file,fileList){
this.addShow = fileList.length>0 ?true:false;
}
}, },
created() { created() {
// this.fileList = this.list; // this.fileList = this.list;
this.addShow = this.fileArr.length>0 ?true:false;
}, },
}; };
</script> </script>
...@@ -223,4 +234,5 @@ export default { ...@@ -223,4 +234,5 @@ export default {
.ele-upload-list__item-content-action .el-link { .ele-upload-list__item-content-action .el-link {
margin-right: 10px; margin-right: 10px;
} }
</style> </style>
gassafety-web/src/components/PopWindow/flowMeter.vue
View file @ 30f5d6c6
...@@ -3,62 +3,111 @@ ...@@ -3,62 +3,111 @@
:title="title" :title="title"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
width="80%" width="80%"
:before-close="handleClose"> :before-close="handleClose"
<el-form ref="form" :model="form" :rules="rules" label-width="135px"> >
<el-form-item label="所属管道" prop="pipeCode"> <el-row>
<el-select v-model="form.pipeCode" placeholder="请选择所属管道"> <el-form ref="form" :model="form" :rules="rules" label-width="135px">
<el-option <el-col :span="22">
v-for="item in pipeList" <el-form-item label="所属管道" prop="pipeCode">
:key="item.pipeCode" <el-select v-model="form.pipeCode" placeholder="请选择所属管道">
:label="item.pipeName" <el-option
:value="item.pipeCode"> v-for="item in pipeList"
</el-option> :key="item.pipeCode"
</el-select> :label="item.pipeName"
</el-form-item> :value="item.pipeCode"
<el-form-item label="设备名称" prop="deviceName"> >
<el-input v-model="form.deviceName" placeholder="请输入设备名称" /> </el-option>
</el-form-item> </el-select>
<el-form-item label="所在地址" prop="deviceAddr"> </el-form-item>
<el-input v-model="form.deviceAddr" placeholder="请输入所在地址" /> </el-col>
</el-form-item>
<el-form-item label="设备型号" prop="deviceModel"> <el-col :span="11">
<el-input v-model="form.deviceModel" placeholder="请输入设备型号" /> <el-form-item label="设备名称" prop="deviceName">
</el-form-item> <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
<el-form-item label="经度" prop="longitude"> </el-form-item>
<el-input v-model="form.longitude" placeholder="请输入经度" /> </el-col>
</el-form-item>
<el-form-item label="纬度" prop="latitude"> <el-col :span="11">
<el-input v-model="form.latitude" placeholder="请输入纬度" /> <el-form-item label="设备型号" prop="deviceModel">
</el-form-item> <el-input v-model="form.deviceModel" placeholder="请输入设备型号" />
<el-form-item label="物联网编号" prop="iotNo"> </el-form-item>
<el-input v-model="form.iotNo" placeholder="请输入物联网编号" /> </el-col>
</el-form-item> <el-col :span="11">
<el-form-item label="设备图片上传" prop="iconUrl"> <el-form-item label="所在地址" prop="deviceAddr">
<MyFileUpload <el-input v-model="form.deviceAddr" placeholder="请输入所在地址" />
listType="picture-card" </el-form-item>
@resFun="getFileInfo" </el-col>
@remove="listRemove"
:fileArr="fileArr" <el-col :span="11">
/> <el-form-item label="物联网编号" prop="iotNo">
</el-form-item> <el-input v-model="form.iotNo" placeholder="请输入物联网编号" />
<el-form-item label="联系人" prop="linkman"> </el-form-item>
<el-input v-model="form.linkman" placeholder="请输入联系人" /> </el-col>
</el-form-item>
<el-form-item label="电话" prop="phone"> <el-col :span="22">
<el-input v-model="form.phone" placeholder="请输入电话" /> <el-form-item label="经纬度坐标" prop="">
</el-form-item> <el-card class="box-card">
<el-form-item label="安装时间" prop="installationTime"> <div v-text="`[[${form.longitude},${form.latitude}]]`"></div>
<el-date-picker clearable size="small" </el-card>
v-model="form.installationTime" </el-form-item>
type="datetime" </el-col>
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择安装时间"> <!-- <el-col>
</el-date-picker> <el-form-item label="纬度" prop="latitude">
</el-form-item> <el-input v-model="form.latitude" placeholder="请输入纬度" />
<el-form-item label="备注" prop="remarks"> </el-form-item>
<el-input v-model="form.remarks" placeholder="请输入备注" /> </el-col> -->
</el-form-item>
</el-form> <el-col :span="11">
<el-form-item label="联系人" prop="linkman">
<el-input v-model="form.linkman" placeholder="请输入联系人" />
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="联系电话" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系电话" />
</el-form-item>
</el-col>
<el-col>
<el-form-item label="设备图片上传" prop="iconUrl">
<MyFileUpload
listType="picture-card"
@resFun="getFileInfo"
@remove="listRemove"
:fileArr="fileArr"
/>
<el-input v-show="false" disabled v-model="form.iconUrl"></el-input>
</el-form-item>
</el-col>
<el-col>
<el-form-item label="安装时间" prop="installationTime">
<el-date-picker
clearable
size="small"
v-model="form.installationTime"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择安装时间"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="22">
<el-form-item label="备注" prop="remarks">
<el-input
type="textarea"
v-model="form.remarks"
placeholder="请输入备注"
/>
</el-form-item>
</el-col>
</el-form>
</el-row>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button> <el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
...@@ -67,57 +116,93 @@ ...@@ -67,57 +116,93 @@
</template> </template>
<script> <script>
import {
getAllDeviceInfo,
addDeviceInfo,
updateDeviceInfo,
} from "@/api/device/deviceInfo";
import { pipeAllInfoList } from "@/api/device/pipe";
import MyFileUpload from "@/components/MyFileUpload";
import { DEVICE_TYPE } from "utils/gaodeMap.js";
import { getAllDeviceInfo ,addDeviceInfo, updateDeviceInfo } from "@/api/device/deviceInfo"; export default {
import { pipeAllInfoList } from "@/api/device/pipe"; props: {
import MyFileUpload from "@/components/MyFileUpload"; title: { type: String },
import { DEVICE_TYPE } from "utils/gaodeMap.js"; },
data() {
export default { return {
props: { form: {
title: { type: String } deviceType: "3",
},
dialogVisible: false,
fileList: [],
// 表单校验
rules: {},
map: null,
obj: null,
gaoMap: null,
fileArr: [],
pipeList: [],
rules: {
pipeCode: [
{ required: true, message: "请选择所属管道", trigger: "blur" },
// { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" },
],
deviceName: [
{ required: true, message: "请输入设备名称", trigger: "blur" },
],
deviceModel: [
{ required: true, message: "请输入设备型号", trigger: "blur" },
],
deviceAddr: [
{ required: true, message: "请输入所在地址", trigger: "blur" },
],
iotNo: [
{ required: true, message: "请输入物联网编号", trigger: "blur" },
],
linkman: [
{ required: true, message: "请输入联系人", trigger: "blur" },
],
phone: [
{ required: true, message: "请输入联系电话", trigger: "blur" },
],
iconUrl: [{ required: true, message: "请上传图片", trigger: "change" }],
installationTime: [
{
// type: "date",
required: true,
message: "请选择日期",
trigger: "change",
},
],
},
};
},
components: {
MyFileUpload,
},
methods: {
show() {
this.dialogVisible = true;
}, },
data () { hide() {
return { this.remove();
form : {
deviceType : "3"
},
dialogVisible : false,
fileList: [],
// 表单校验
rules: {
},
map : null,
obj : null,
gaoMap : null,
fileArr: [],
pipeList: []
}
}, },
components: { getFileInfo(res) {
MyFileUpload, this.form.iconUrl = res.url;
}, },
methods: { submitForm() {
show () { this.$refs["form"].validate((valid) => {
this.dialogVisible = true; if (valid) {
}, if (this.form.deviceId != null) {
hide () { updateDeviceInfo(this.form).then((response) => {
this.remove() this.dialogVisible = false;
}, this.map.remove(this.obj);
getFileInfo(res){ this.gaoMap.addMarker(this.gaoMap.deviceType, this.form);
this.form.iconUrl = res.url; this.msgSuccess("修改成功");
}, });
submitForm() { } else {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.deviceId != null) {
updateDeviceInfo(this.form).then(response => {
this.dialogVisible = false;
this.map.remove(this.obj);
this.gaoMap.addMarker(this.gaoMap.deviceType,this.form);
this.msgSuccess("修改成功");
});
} else {
addDeviceInfo(this.form).then(response => { addDeviceInfo(this.form).then(response => {
if(response.code == 200){ if(response.code == 200){
this.remove(); this.remove();
...@@ -133,22 +218,23 @@ ...@@ -133,22 +218,23 @@
}); });
} }
} }
}); }
}, );
handleClose(done) { },
done(); handleClose(done) {
}, done();
listRemove(e) { },
this.form.url = ""; listRemove(e) {
this.fileArr = []; this.form.url = "";
} this.fileArr = [];
}, },
mounted(){ },
pipeAllInfoList({}).then(response => { mounted() {
this.pipeList = response.data; pipeAllInfoList({}).then((response) => {
}); this.pipeList = response.data;
} });
} },
};
</script> </script>
gassafety-web/src/components/TopNav/index.vue
View file @ 30f5d6c6
...@@ -6,12 +6,17 @@ ...@@ -6,12 +6,17 @@
> >
<template v-for="(item, index) in topMenus"> <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="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber" -->
<el-menu-item :style="" :index="item.path" :key="index" v-if="index < visibleNumber"> <el-menu-item
:style=""
<!-- 导航栏左侧图标 --> :index="item.path"
<!-- <svg-icon :icon-class="item.meta.icon" /> --> :key="index"
{{ item.meta.title }}</el-menu-item> v-if="index < visibleNumber"
<div class="menu-item-div"></div> >
<!-- 导航栏左侧图标 -->
<!-- <svg-icon :icon-class="item.meta.icon" /> -->
{{ item.meta.title }}
</el-menu-item>
<!-- <div class="menu-item-div"></div> -->
</template> </template>
<!-- 顶部菜单超出数量折叠 --> <!-- 顶部菜单超出数量折叠 -->
...@@ -32,7 +37,7 @@ ...@@ -32,7 +37,7 @@
<script> <script>
import { constantRoutes } from "@/router"; import { constantRoutes } from "@/router";
import '../../common/font/font.css' import "../../common/font/font.css";
export default { export default {
data() { data() {
return { return {
...@@ -41,7 +46,7 @@ export default { ...@@ -41,7 +46,7 @@ export default {
// 是否为首次加载 // 是否为首次加载
isFrist: false, isFrist: false,
// 当前激活菜单的 index // 当前激活菜单的 index
currentIndex: undefined currentIndex: undefined,
}; };
}, },
computed: { computed: {
...@@ -55,9 +60,9 @@ export default { ...@@ -55,9 +60,9 @@ export default {
if (menu.hidden !== true) { if (menu.hidden !== true) {
// 兼容顶部栏一级菜单内部跳转 // 兼容顶部栏一级菜单内部跳转
if (menu.path === "/") { if (menu.path === "/") {
topMenus.push(menu.children[0]); topMenus.push(menu.children[0]);
} else { } else {
topMenus.push(menu); topMenus.push(menu);
} }
} }
}); });
...@@ -73,12 +78,14 @@ export default { ...@@ -73,12 +78,14 @@ export default {
this.routers.map((router) => { this.routers.map((router) => {
for (var item in router.children) { for (var item in router.children) {
if (router.children[item].parentPath === undefined) { if (router.children[item].parentPath === undefined) {
if(router.path === "/") { if (router.path === "/") {
router.children[item].path = "/redirect/" + router.children[item].path; router.children[item].path =
"/redirect/" + router.children[item].path;
} else { } else {
if(!this.ishttp(router.children[item].path)) { if (!this.ishttp(router.children[item].path)) {
router.children[item].path = router.path + "/" + router.children[item].path; router.children[item].path =
} router.path + "/" + router.children[item].path;
}
} }
router.children[item].parentPath = router.path; router.children[item].parentPath = router.path;
} }
...@@ -103,17 +110,17 @@ export default { ...@@ -103,17 +110,17 @@ export default {
} }
var routes = this.activeRoutes(activePath); var routes = this.activeRoutes(activePath);
if (routes.length === 0) { if (routes.length === 0) {
activePath = this.currentIndex || this.routers[0].path activePath = this.currentIndex || this.routers[0].path;
this.activeRoutes(activePath); this.activeRoutes(activePath);
} }
return activePath; return activePath;
}, },
}, },
beforeMount() { beforeMount() {
window.addEventListener('resize', this.setVisibleNumber) window.addEventListener("resize", this.setVisibleNumber);
}, },
beforeDestroy() { beforeDestroy() {
window.removeEventListener('resize', this.setVisibleNumber) window.removeEventListener("resize", this.setVisibleNumber);
}, },
mounted() { mounted() {
this.setVisibleNumber(); this.setVisibleNumber();
...@@ -126,6 +133,7 @@ export default { ...@@ -126,6 +133,7 @@ export default {
}, },
// 菜单选择事件 // 菜单选择事件
handleSelect(key, keyPath) { handleSelect(key, keyPath) {
console.log(key)
this.currentIndex = key; this.currentIndex = key;
if (this.ishttp(key)) { if (this.ishttp(key)) {
// http(s):// 路径新窗口打开 // http(s):// 路径新窗口打开
...@@ -148,14 +156,14 @@ export default { ...@@ -148,14 +156,14 @@ export default {
} }
}); });
} }
if(routes.length > 0) { if (routes.length > 0) {
this.$store.commit("SET_SIDEBAR_ROUTERS", routes); this.$store.commit("SET_SIDEBAR_ROUTERS", routes);
} }
return routes; return routes;
}, },
ishttp(url) { ishttp(url) {
return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1 return url.indexOf("http://") !== -1 || url.indexOf("https://") !== -1;
} },
}, },
}; };
</script> </script>
...@@ -176,33 +184,39 @@ export default { ...@@ -176,33 +184,39 @@ export default {
} }
.el-menu--horizontal > .el-menu-item.is-active { .el-menu--horizontal > .el-menu-item.is-active {
border-bottom: 3px solid #{'var(--theme)'}; border-bottom: 3px solid #{"var(--theme)"};
/* box-shadow: inset 2px 2px 20px #5CD9D4; */ /* box-shadow: inset 2px 2px 20px #5CD9D4; */
color: #5CD9D4; color: #5cd9d4;
} }
/* submenu item */ /* submenu item */
.el-menu--horizontal > .el-submenu .el-submenu__title { .el-menu--horizontal > .el-submenu .el-submenu__title {
height: 50px !important; height: 50px !important;
line-height: 50px !important; line-height: 50px !important;
} }
.el-menu--horizontal > .el-menu-item:not(.is-disabled):hover, .el-menu--horizontal > .el-menu-item:not(.is-disabled):focus{ .el-menu--horizontal > .el-menu-item:not(.is-disabled):hover,
.el-menu--horizontal > .el-menu-item:not(.is-disabled):focus {
background-color: rgba(0, 0, 0, 0); background-color: rgba(0, 0, 0, 0);
/* opacity: 0; */ /* opacity: 0; */
/* box-shadow: inset 2px 2px 20px #5CD9D4; */ /* box-shadow: inset 2px 2px 20px #5CD9D4; */
color: #fff; color: #fff;
} }
.menu-item-div{ .menu-item-div {
width: 2px; width: 2px;
height: 30px; height: 30px;
margin-top: 25px; margin-top: 25px;
background-color: rgb(190, 189, 189); background-color: rgb(190, 189, 189);
float: left; float: left;
background: linear-gradient(130deg, rgba(0, 0, 0, 0) 0%,rgba(255,255,255,0.7) 50%, rgba(0, 0, 0, 0) 100%); background: linear-gradient(
130deg,
rgba(0, 0, 0, 0) 0%,
rgba(255, 255, 255, 0.7) 50%,
rgba(0, 0, 0, 0) 100%
);
&:last-child { &:last-child {
width: 0px; width: 0px;
height: 0px; height: 0px;
} }
} }
</style> </style>
gassafety-web/src/layout/components/Sidebar/SidebarItem.vue
View file @ 30f5d6c6
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
<app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)"> <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
<el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}"> <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
<item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)"/><br> <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)"/><br>
<item :title="onlyOneChild.meta.title" /> <!-- <item :title="onlyOneChild.meta.title" /> -->
{{onlyOneChild.meta.title}}
</el-menu-item> </el-menu-item>
</app-link> </app-link>
</template> </template>
......
gassafety-web/src/layout/index.vue
View file @ 30f5d6c6
<template> <template>
<div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}"> <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
<div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" /> <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
<sidebar class="sidebar-container" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBg }" /> <Sidebar class="sidebar-container" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBg }" />
<div :class="{hasTagsView:needTagsView}" class="main-container"> <div :class="{hasTagsView:needTagsView}" class="main-container">
<div :class="{'fixed-header':fixedHeader}"> <div :class="{'fixed-header':fixedHeader}">
<navbar /> <navbar />
......
gassafety-web/src/utils/gaodeMap.js
View file @ 30f5d6c6
...@@ -720,14 +720,22 @@ class gaodeMap { ...@@ -720,14 +720,22 @@ class gaodeMap {
that.markerOverlays.push(e.obj); that.markerOverlays.push(e.obj);
} }
if (e.obj && e.obj.getExtData().type == "newLine") { if (e.obj && e.obj.getExtData().type == "newLine") {
console.log("挂上事件"); console.log("挂上事件");
that.newLineAddEvent(e.obj); that.newLineAddEvent(e.obj);
// 记录这条线 // 记录这条线
that.newLineObj = e.obj; // console.log(e.obj.getPath().length)
// 如果只有一个点，并没有连成线的时候就不close 大于一个点的时候才执行clse
console.log(that.lineType)
if (e.obj.getPath().length > 1) {
that.newLineObj = e.obj;
that.mouseTool.close();
} else {
// that.newLineObj = null;
}
// 关闭 // 关闭
that.mouseTool.close();
// 创建一条新线，然后在点地图的时候删除原来的旧线 // 创建一条新线，然后在点地图的时候删除原来的旧线
// that.createNewLine(); // that.createNewLine();
......
gassafety-web/src/views/enterprise/map/index.vue
View file @ 30f5d6c6
...@@ -233,6 +233,7 @@ export default { ...@@ -233,6 +233,7 @@ export default {
this.gaoMap.lineType = 1; this.gaoMap.lineType = 1;
} else { } else {
this.gaoMap.lineType = 0; this.gaoMap.lineType = 0;
this.gaoMap.mouseTool.close();
} }
// 关闭当前线条的infowindow // 关闭当前线条的infowindow
this.gaoMap.closeLineInfoWindow(); this.gaoMap.closeLineInfoWindow();
......
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