Skip to content

G
gassafety
Commit 087ad856 authored by yaqizhang's avatar yaqizhang
Browse files
Options

Merge branch 'master' of http://111.61.77.35:9999/gengdidi/gassafety into master

parents 31b9cf54 8fd1b106
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 28 deletions
gassafety-admin/src/main/java/com/zehong/web/controller/dataMonitoring/TDeviceAlarmController.java
View file @ 087ad856
......@@ -40,7 +40,7 @@ public class TDeviceAlarmController extends BaseController
/**
* 查询报警信息列表
*/
@PreAuthorize("@ss.hasPermi('dataMonitoring:deviceAlarm:list')")
//@PreAuthorize("@ss.hasPermi('dataMonitoring:deviceAlarm:list')")
@GetMapping("/list")
public TableDataInfo list(DeviceAlarmForm deviceAlarmForm) throws Exception
{
......
gassafety-admin/src/main/java/com/zehong/web/controller/device/TDeviceInfoController.java
View file @ 087ad856
......@@ -141,7 +141,7 @@ public class TDeviceInfoController extends BaseController
/**
* 统计各设备类型的设备总数
*/
@PreAuthorize("@ss.hasPermi('device:deviceInfo:countDeviceByType')")
//@PreAuthorize("@ss.hasPermi('device:deviceInfo:countDeviceByType')")
@GetMapping("/countDeviceByType")
public AjaxResult countDeviceByType()
{
......
gassafety-admin/src/main/java/com/zehong/web/controller/device/TPipeController.java
View file @ 087ad856
......@@ -112,7 +112,7 @@ public class TPipeController extends BaseController
/**
* 统计管道总长度
*/
@PreAuthorize("@ss.hasPermi('device:pipe:countPipeLength')")
//@PreAuthorize("@ss.hasPermi('device:pipe:countPipeLength')")
@GetMapping("/countPipeLength")
public AjaxResult countPipeLength()
{
......
gassafety-admin/src/main/java/com/zehong/web/controller/system/SysUserController.java
View file @ 087ad856
......@@ -82,7 +82,7 @@ public class SysUserController extends BaseController
/**
* 获取巡检员列表
*/
@PreAuthorize("@ss.hasPermi('system:user:inspectorList')")
//@PreAuthorize("@ss.hasPermi('system:user:inspectorList')")
@GetMapping("/inspectorList")
public AjaxResult inspectorList()
{
......
gassafety-web/src/components/FileUpload/index.vue
View file @ 087ad856
......@@ -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 @ 087ad856
......@@ -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/views/device/deviceInfo/index.vue
View file @ 087ad856
......@@ -353,9 +353,6 @@
form: {},
// 表单校验
rules: {
pipeId: [
{ required: true, message: "请选择所属管道", trigger: "blur" },
],
deviceType: [
{ required: true, message: "请选择设备类型", trigger: "blur" },
],
......
gassafety-web/src/views/enterprise/mapView/index.vue
View file @ 087ad856
......@@ -162,12 +162,17 @@
</div>
<div
class="deviceList"
:class="{ topActive: index == 0 }"
v-for="(iten, index) in item.list"
:class="{
topActive: index == 0,
textRed: iten.alarmState == 1,
}"
:key="iten.deviceId + `` + index"
@click.stop="panToo(iten, item)"
>
<div class="no">{{ iten.no + 1 }}</div>
<div class="no">
{{ iten.no + 1 }}
</div>
<div :title="iten.code" class="code">
{{ iten.code }}
</div>
......@@ -404,11 +409,11 @@ export default {
// });
},
watch: {
changeBtnData: {
handler(newName, oldName) {},
deep: true,
// immediate: true,
},
// changeBtnData: {
// handler(newName, oldName) {},
// deep: true,
// // immediate: true,
// },
},
methods: {
onResize() {
......@@ -456,9 +461,11 @@ export default {
.then((res) => {
if (res == 200) {
// 所有设备上图结束之后，左边的抽屉加载数据
this.pipeList();
this.pipeList().then((res) => {
console.log("开始报警准备");
this.getSelectAlarmDevice();
});
// 获取报警资源
this.getSelectAlarmDevice();
}
});
},
......@@ -536,7 +543,7 @@ export default {
},
// 获取报警资源，并且改变图上的状态
getSelectAlarmDevice() {
selectAlarmDevice().then((res) => {
return selectAlarmDevice().then((res) => {
if (res.length > 0) {
}
console.log("报警设备", res);
......@@ -565,8 +572,10 @@ export default {
const pipeId = item.getExtData().lineData.pipeId;
return deviceId == pipeId;
})[0];
if (polyline) {
let options = polyline.getExtData();
// 增加一个报警状态
// 如果有endtime说明状态已经不是报警状态了，要归位，所有东西都要变回来
options.lineData.view = this;
......@@ -590,6 +599,15 @@ export default {
console.log("管道报警");
}
polyline.setExtData(options);
const myP = this.allList[0].filter((item) => {
console.log(item.selfData.alarmState);
return item.selfData.alarmState;
})[0];
// console.log("this.allList[0]", this.allList[0]);
// console.log("myP", myP);
// 改变左侧列表的状态（1报警，0，正常）
myP.alarmState = options.lineData.alarmState;
}
});
}
......@@ -628,6 +646,19 @@ export default {
options.alarmValue = alarmValue;
}
device.setExtData(options);
// 找到是列表里的哪个，改变它的状态，让列表里的这个设备变成红色
const myDevice = this.allList.filter((item) => {
for (let i = 0; i < item.length; i++) {
const iten = item[i];
// 不是隐患也不是值班人员
if (!iten.troubleId && !iten.userId) {
return iten.deviceId == device.getExtData().deviceId;
}
}
})[0][0];
// console.log("myDevice", myDevice);
myDevice.alarmState = options.alarmState;
// const imageName = device.getExtData()
// console.log(imageName)
......@@ -866,7 +897,6 @@ export default {
this.diveceInfoWindowShow(iten, lat, lng);
}
},
// 如果是线条飞过去出现infowindow
polylineInfoWindowShow(iten, lat, lng) {
const target = this.gaoMap.polyLines.filter((item) => {
......@@ -991,6 +1021,8 @@ export default {
deviceType: "0",
deviceName: item.pipeName,
code: item.pipeCode,
alarmState: item.alarmState ? item.alarmState : "0",
selfData: item,
};
});
this.allList[0] = pipeArr;
......@@ -1011,6 +1043,8 @@ export default {
deviceType: item.deviceType,
deviceName: item.deviceName,
code: item.iotNo,
alarmState: item.alarmState ? item.alarmState : "0",
selfData: item,
};
});
// 所有阀门井数据
......@@ -1026,6 +1060,8 @@ export default {
deviceType: item.deviceType,
deviceName: item.deviceName,
code: item.iotNo,
alarmState: item.alarmState ? item.alarmState : "0",
selfData: item,
};
});
// 所有流量计数据
......@@ -1041,6 +1077,8 @@ export default {
deviceType: item.deviceType,
deviceName: item.deviceName,
code: item.iotNo,
alarmState: item.alarmState ? item.alarmState : "0",
selfData: item,
};
});
// 所有压力表数据
......@@ -1056,6 +1094,8 @@ export default {
deviceType: item.deviceType,
deviceName: item.deviceName,
code: item.iotNo,
alarmState: item.alarmState ? item.alarmState : "0",
selfData: item,
};
});
// console.log("设备", tyxArr, fmjArr, lljArr, ylbArr);
......@@ -1093,7 +1133,7 @@ export default {
this.allList[6] = workManArr;
},
// 左边设备翻页
pipeList(pageNum) {
async pipeList(pageNum) {
const num = pageNum ? pageNum : 10;
// const { nowPage } = this.changeBtnData[0];
// this.changeBtnData[0].list = this.allList[0].filter((item, index) => {
......@@ -1265,6 +1305,7 @@ export default {
} else {
// 左边全选
this.leftBarNum = [1, 2, 3, 4, 7, 8, 9];
// this.arrowRightNum=[];
// 右转箭头的样式active判定
// this.arrowRightNum = [];
// 清空左边列表
......@@ -1278,12 +1319,13 @@ export default {
await this.getInspectorLocations({ userName: this.keyWord });
await this.getMapHiddenTroublelist({ troubleName: this.keyWord });
// 设备报警
this.getSelectAlarmDevice();
this.changeBtnData.forEach((item) => {
item.nowPage = 1;
});
this.pipeList();
this.pipeList().then(() => {
// 设备报警
this.getSelectAlarmDevice();
});
}
},
// 清空左边列表
......@@ -1640,7 +1682,7 @@ input[type="radio"] {
}
.deviceList {
cursor: pointer;
margin-bottom: 2px;
margin-bottom: 10px;
box-sizing: border-box;
border-bottom: 1px solid #053b6a00;
color: #1d1d1d;
......@@ -1682,6 +1724,16 @@ input[type="radio"] {
width: 100px;
text-align: center;
}
.textRed {
.no,
.name,
.code {
color: red;
}
&:hover {
border-bottom: 1px solid red;
}
}
}
.box {
width: 348px;
......
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