diff --git a/tzipc-ui/public/theme/blueTheme/img1.png b/tzipc-ui/public/theme/blueTheme/img1.png index 0486d0a..4a25679 100644 Binary files a/tzipc-ui/public/theme/blueTheme/img1.png and b/tzipc-ui/public/theme/blueTheme/img1.png differ diff --git a/tzipc-ui/public/theme/blueTheme/img2.png b/tzipc-ui/public/theme/blueTheme/img2.png index 999d45b..28dd636 100644 Binary files a/tzipc-ui/public/theme/blueTheme/img2.png and b/tzipc-ui/public/theme/blueTheme/img2.png differ diff --git a/tzipc-ui/public/theme/blueTheme/img3.png b/tzipc-ui/public/theme/blueTheme/img3.png index cff7465..1e1ddb6 100644 Binary files a/tzipc-ui/public/theme/blueTheme/img3.png and b/tzipc-ui/public/theme/blueTheme/img3.png differ diff --git a/tzipc-ui/public/theme/blueTheme/img4.png b/tzipc-ui/public/theme/blueTheme/img4.png index 1500732..030907b 100644 Binary files a/tzipc-ui/public/theme/blueTheme/img4.png and b/tzipc-ui/public/theme/blueTheme/img4.png differ diff --git a/tzipc-ui/public/theme/default/img1.png b/tzipc-ui/public/theme/default/img1.png index 9f3925e..9983f80 100644 Binary files a/tzipc-ui/public/theme/default/img1.png and b/tzipc-ui/public/theme/default/img1.png differ diff --git a/tzipc-ui/public/theme/default/img2.png b/tzipc-ui/public/theme/default/img2.png index 67da21b..6ae9027 100644 Binary files a/tzipc-ui/public/theme/default/img2.png and b/tzipc-ui/public/theme/default/img2.png differ diff --git a/tzipc-ui/public/theme/default/img3.png b/tzipc-ui/public/theme/default/img3.png index 2ab6162..d615098 100644 Binary files a/tzipc-ui/public/theme/default/img3.png and b/tzipc-ui/public/theme/default/img3.png differ diff --git a/tzipc-ui/public/theme/default/img4.png b/tzipc-ui/public/theme/default/img4.png index 3d08aa4..70bc8c3 100644 Binary files a/tzipc-ui/public/theme/default/img4.png and b/tzipc-ui/public/theme/default/img4.png differ diff --git a/tzipc-ui/public/theme/redTheme/img1.png b/tzipc-ui/public/theme/redTheme/img1.png index 11c0e01..b523538 100644 Binary files a/tzipc-ui/public/theme/redTheme/img1.png and b/tzipc-ui/public/theme/redTheme/img1.png differ diff --git a/tzipc-ui/public/theme/redTheme/img2.png b/tzipc-ui/public/theme/redTheme/img2.png index 70c8f7a..a96e9f3 100644 Binary files a/tzipc-ui/public/theme/redTheme/img2.png and b/tzipc-ui/public/theme/redTheme/img2.png differ diff --git a/tzipc-ui/public/theme/redTheme/img3.png b/tzipc-ui/public/theme/redTheme/img3.png index 5a397b2..1e0c53e 100644 Binary files a/tzipc-ui/public/theme/redTheme/img3.png and b/tzipc-ui/public/theme/redTheme/img3.png differ diff --git a/tzipc-ui/public/theme/redTheme/img4.png b/tzipc-ui/public/theme/redTheme/img4.png index 23dfed0..275d3a6 100644 Binary files a/tzipc-ui/public/theme/redTheme/img4.png and b/tzipc-ui/public/theme/redTheme/img4.png differ diff --git a/tzipc-ui/src/views/ipc/bigscreen/index.vue b/tzipc-ui/src/views/ipc/bigscreen/index.vue index 3960fee..df05b48 100644 --- a/tzipc-ui/src/views/ipc/bigscreen/index.vue +++ b/tzipc-ui/src/views/ipc/bigscreen/index.vue @@ -175,8 +175,8 @@ >
进油压力
+ @click="handleViewTendency(queryParams[0], titleMap[queryParams[0]], 'oip', '抽油泵压力', 'Bar')" + >抽油泵压力
- {{ parseInt(l1 * 100) }} + {{ parseInt(l1 ) }}
- {{ parseInt(r2 * 100) }} + {{ parseInt(r2) }}
进油压力
+ @click="handleViewTendency(queryParams[1], titleMap[queryParams[1]], 'oip', '抽油泵压力', 'Bar')" + >抽油泵压力
{ + if (isArray(objVal)) return srcVal; + } + ); + }, generateOptions(option = {}) { return merge( { diff --git a/tzipc-ui/src/views/ipc/dataLog/plcDataLog.vue b/tzipc-ui/src/views/ipc/dataLog/plcDataLog.vue index c9a770b..8a6fb3a 100644 --- a/tzipc-ui/src/views/ipc/dataLog/plcDataLog.vue +++ b/tzipc-ui/src/views/ipc/dataLog/plcDataLog.vue @@ -176,7 +176,7 @@ show-overflow-tooltip />
- +