diff --git a/ruoyi-ui/src/assets/board/allScenes/bg1.png b/ruoyi-ui/src/assets/board/allScenes/bg1.png
index e69de29..987361f 100644
Binary files a/ruoyi-ui/src/assets/board/allScenes/bg1.png and b/ruoyi-ui/src/assets/board/allScenes/bg1.png differ
diff --git a/ruoyi-ui/src/assets/board/allScenes/item.png b/ruoyi-ui/src/assets/board/allScenes/item.png
index e69de29..f715f75 100644
Binary files a/ruoyi-ui/src/assets/board/allScenes/item.png and b/ruoyi-ui/src/assets/board/allScenes/item.png differ
diff --git a/ruoyi-ui/src/views/board/GPS/index.vue b/ruoyi-ui/src/views/board/GPS/index.vue
index bf01f0d..4e4a054 100644
--- a/ruoyi-ui/src/views/board/GPS/index.vue
+++ b/ruoyi-ui/src/views/board/GPS/index.vue
@@ -42,8 +42,9 @@
class="scrollTable">
{{ item.value3 }}
-
@@ -143,6 +144,23 @@ export default {
this.setElectronicNumVo()
},
methods: {
+ dispose() {
+ this.$confirm('该问题已处理?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ this.$message({
+ type: 'success',
+ message: '已处理!'
+ });
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '已取消'
+ });
+ });
+ },
createMap() {
map = new AMap.Map('map', {
zoom: 11,
@@ -233,6 +251,7 @@ export default {
value1: i,
value2: '高温预警',
value3: e.monitorUnitName,
+ status:e.handleStatus
}
})
},
diff --git a/ruoyi-ui/src/views/board/equipment/index.vue b/ruoyi-ui/src/views/board/equipment/index.vue
index 34c800f..2d9101f 100644
--- a/ruoyi-ui/src/views/board/equipment/index.vue
+++ b/ruoyi-ui/src/views/board/equipment/index.vue
@@ -41,14 +41,15 @@
-
+
{{ i.deviceName }}
+ inactive-color="#1facf4"
+ @change="switchChange(k)">
@@ -68,12 +69,9 @@
@@ -106,7 +104,7 @@ export default {
treeData: [],
controlList: [],
acquisitionList: [],
- MonitorInfo:{}
+ MonitorInfo: {}
}
},
mounted() {
@@ -116,6 +114,24 @@ export default {
this.setMonitorById()
},
methods: {
+ switchChange(e) {
+ this.$confirm((this.controlList[e].deviceType === '1' ? '关闭' : '开启')+'该设备?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ this.$message({
+ type: 'success',
+ message: '成功!'
+ });
+ this.controlList[e].deviceType === '1' ? this.controlList[e].deviceType = '0' : this.controlList[e].deviceType = '1'
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '取消'
+ });
+ });
+ },
async getTree() {
const {data} = await treeList()
console.log(data)
@@ -392,7 +408,7 @@ export default {
.btnC {
position: absolute;
left: 50%;
- transform: translateX(-50%);
+ transform: translate(-50%,50%);
}
}
}
diff --git a/ruoyi-ui/src/views/board/index/index.vue b/ruoyi-ui/src/views/board/index/index.vue
index 3dd8f15..d533bd0 100644
--- a/ruoyi-ui/src/views/board/index/index.vue
+++ b/ruoyi-ui/src/views/board/index/index.vue
@@ -4,10 +4,7 @@
-
电流互感器
-
电压互感器
-
变压器
-
电容电抗器
+
{{ i.name }}
@@ -128,7 +125,8 @@
{{ item.location }}
- 操作
+ 处理
+ 已处理
@@ -301,12 +299,12 @@ export default {
series: [
{
type: "bar",
- data: data.map((e, i) => {
+ data: data.slice(0, 4).map((e, i) => {
return {
value: parseFloat(e.percentage),
name: e.sceneName,
itemStyle: {
- color: this.chart1Color[this.chart1Color.length % i]
+ color: this.chart1Color[i]
}
}
}),
@@ -335,7 +333,7 @@ export default {
dataset: {
source: [
["group", "占比"],
- ...data.map(e => [e.deviceModeName, parseFloat(e.percentage)])
+ ...data.slice(0, 7).map(e => [e.deviceModeName, parseFloat(e.percentage)])
],
}
}
@@ -352,25 +350,25 @@ export default {
const data = await allNums()
this.centerNum = data
},
- async setTable3(){
- const {rows:data} = await getAlarmInfos()
- this.table1Data = data.map((e,i) => {
+ async setTable3() {
+ const {rows: data} = await getAlarmInfos()
+ this.table1Data = data.map((e, i) => {
return {
- no: i,
+ no: i+1,
type: '高温警告',
location: e.monitorUnitName,
-
+ status:e.handleStatus
}
})
},
- async setDeviceOperations(){
- const {data:data} = await getDeviceOperations()
+ async setDeviceOperations() {
+ const {data: data} = await getDeviceOperations()
console.log(data)
let x = Object.keys(data)
let y = Object.values(data)
- this.inTransitNum = y.reduce((a,b)=> {
+ this.inTransitNum = y.reduce((a, b) => {
return a + b
- },0)
+ }, 0)
let option3 = {
...this.chart3Option,
@@ -426,6 +424,23 @@ export default {
}
this.$refs.chart3.setData(option3)
},
+ dispose() {
+ this.$confirm('该问题已处理?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ this.$message({
+ type: 'success',
+ message: '已处理!'
+ });
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '已取消'
+ });
+ });
+ }
}
}
;