diff --git a/ruoyi-ui/jsconfig.json b/ruoyi-ui/jsconfig.json
new file mode 100644
index 0000000..4aafc5f
--- /dev/null
+++ b/ruoyi-ui/jsconfig.json
@@ -0,0 +1,19 @@
+{
+ "compilerOptions": {
+ "target": "es5",
+ "module": "esnext",
+ "baseUrl": "./",
+ "moduleResolution": "node",
+ "paths": {
+ "@/*": [
+ "src/*"
+ ]
+ },
+ "lib": [
+ "esnext",
+ "dom",
+ "dom.iterable",
+ "scripthost"
+ ]
+ }
+}
diff --git a/ruoyi-ui/src/assets/board/index/leftButtonBg.png b/ruoyi-ui/src/assets/board/index/leftButtonBg.png
new file mode 100644
index 0000000..58ca2a6
Binary files /dev/null and b/ruoyi-ui/src/assets/board/index/leftButtonBg.png differ
diff --git a/ruoyi-ui/src/assets/board/index/rightButtonBg.png b/ruoyi-ui/src/assets/board/index/rightButtonBg.png
new file mode 100644
index 0000000..97343d3
Binary files /dev/null and b/ruoyi-ui/src/assets/board/index/rightButtonBg.png differ
diff --git a/ruoyi-ui/src/views/board/equipment/index.vue b/ruoyi-ui/src/views/board/equipment/index.vue
index a415fb5..432f841 100644
--- a/ruoyi-ui/src/views/board/equipment/index.vue
+++ b/ruoyi-ui/src/views/board/equipment/index.vue
@@ -11,9 +11,9 @@
accordion
node-key="id"
@node-click="treeClick">
-
- {{ node.label }}
-
+
+ {{ node.label }}
+
@@ -48,7 +48,6 @@
type="primary"
@click="switchChange(i.deviceModeFunction.functionIdentifier,i.deviceId,i.deviceCode,i.deviceModeFunction.modeFunctionId)">
执行
-
@@ -96,10 +95,9 @@
-
@@ -250,8 +248,8 @@ export default {
time: [new Date(new Date().getTime() - 1000 * 60 * 60 * 24), new Date()],
},
historyData: [],
- historyTh:{},
- isHistoryTable:true,
+ historyTh: {},
+ isHistoryTable: true,
total: 100,
comparisonDialog: false,
sensorOptions: [],
@@ -365,17 +363,17 @@ export default {
query.endTime = this.parseTime(this.form.time?.[1]?.getTime())
delete query.time
const data = await selectHistoryAndTrendAnalysis(query)
- if(query.type === '1'){
+ if (query.type === '1') {
this.isHistoryTable = false
- this.$nextTick(()=>{
+ this.$nextTick(() => {
let series = Object.keys(data.mapName).map(e => {
- if(data.mapName[e]){
+ if (data.mapName[e]) {
return {
name: data.mapName[e],
type: 'line',
stack: 'Total',
- data: data.tableDataInfo.rows.map(v=>[new Date(v.ts),v[e]])
+ data: data.tableDataInfo.rows.map(v => [new Date(v.ts), v[e]])
}
}
})
@@ -401,9 +399,9 @@ export default {
})
})
}
- if(query.type === '2'){
+ if (query.type === '2') {
this.isHistoryTable = true
- this.$nextTick(()=>{
+ this.$nextTick(() => {
this.historyData = data.tableDataInfo.rows
this.historyTh = data.mapName
this.total = data.tableDataInfo.total
@@ -807,7 +805,8 @@ export default {
width: 100%;
height: 50vh;
}
-.historyChart{
+
+.historyChart {
width: 100%;
height: 50vh;
}
diff --git a/ruoyi-ui/src/views/board/index/index.vue b/ruoyi-ui/src/views/board/index/index.vue
index 60402f5..8dfee47 100644
--- a/ruoyi-ui/src/views/board/index/index.vue
+++ b/ruoyi-ui/src/views/board/index/index.vue
@@ -147,12 +147,33 @@
-
返回
-
-
打开地图
-
+
+
+
+
+
+
+
+
@@ -811,7 +832,7 @@ export default {
this.chartDblClick(this.code)
});
},
- goBack(){
+ goBack() {
this.chartDblClick(this.code)
},
async chartDblClick(val) {
@@ -961,7 +982,7 @@ export default {
}
;
-