diff --git a/.env.development b/.env.development index 8253cfb..8e968ab 100644 --- a/.env.development +++ b/.env.development @@ -7,9 +7,9 @@ ENV = 'development' # 开发环境 # VUE_APP_BASE_API = '/dev-api' # 后台 -VUE_APP_BASE_API = 'http://192.168.1.222:8080' +# VUE_APP_BASE_API = 'http://192.168.1.222:8080' # 云端 -# VUE_APP_BASE_API = 'http://106.55.173.225:8090' +VUE_APP_BASE_API = 'http://106.55.173.225:8090' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/public/favicon.ico b/public/favicon.ico index e263760..050428e 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/assets/images/logo-1.png b/src/assets/images/logo-1.png new file mode 100644 index 0000000..ffcefe8 Binary files /dev/null and b/src/assets/images/logo-1.png differ diff --git a/src/assets/images/logo-2.png b/src/assets/images/logo-2.png new file mode 100644 index 0000000..8d7adf1 Binary files /dev/null and b/src/assets/images/logo-2.png differ diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png index e263760..ffcefe8 100644 Binary files a/src/assets/logo/logo.png and b/src/assets/logo/logo.png differ diff --git a/src/assets/logo/logoRight.png b/src/assets/logo/logoRight.png new file mode 100644 index 0000000..8d7adf1 Binary files /dev/null and b/src/assets/logo/logoRight.png differ diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss index 696dea0..3420def 100644 --- a/src/assets/styles/element-ui.scss +++ b/src/assets/styles/element-ui.scss @@ -1133,11 +1133,11 @@ linear-gradient(#053766, #053766); border-radius: 10px; border: solid 2px #005fbf; - top: 40% !important; + top: 5% !important; display: flex; flex-direction: column; align-items: center; - padding: 25px 15px 25px 20px !important; + padding:10px !important; } /* 修改消息文本颜色 */ @@ -1158,10 +1158,10 @@ background-repeat: no-repeat; background-size: 100% 100%; display: inline-block; - width: 90px; - height: 90px; + width: 50px; + height: 50px; margin-right: 0px !important; - margin-bottom: 16px; + margin-bottom: 10px; vertical-align: middle; } .el-icon-success:before, @@ -1180,10 +1180,10 @@ background-repeat: no-repeat; background-size: 100% 100%; display: inline-block; - width: 90px; - height: 90px; + width: 50px; + height: 50px; margin-right: 0px !important; - margin-bottom: 16px; + margin-bottom: 10px; vertical-align: middle; } .el-message .el-icon-warning { @@ -1192,10 +1192,10 @@ background-repeat: no-repeat; background-size: 100% 100%; display: inline-block; - width: 90px; - height: 90px; + width: 50px; + height: 50px; margin-right: 0px !important; - margin-bottom: 16px; + margin-bottom: 10px; vertical-align: middle; } .el-upload-list__item-name { diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index 6a978db..d78edeb 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -3,11 +3,13 @@ -

{{ title }}

+ +
-

{{ title }}

+ +
@@ -15,6 +17,7 @@ + + diff --git a/src/views/centerairC/sysControl/index copy.vue b/src/views/centerairC/sysControl/index copy.vue new file mode 100644 index 0000000..7bbeb12 --- /dev/null +++ b/src/views/centerairC/sysControl/index copy.vue @@ -0,0 +1,643 @@ + + + + + diff --git a/src/views/centerairC/sysControl/index.vue b/src/views/centerairC/sysControl/index.vue index 0963fed..ff41214 100644 --- a/src/views/centerairC/sysControl/index.vue +++ b/src/views/centerairC/sysControl/index.vue @@ -23,150 +23,68 @@
{{ statistics.warn }}/{{ total }}
- -
- - -
-
{{ item.name }}
-
-
- {{ item.runStatus }} -
+ + +
+
-
- - +
+
-
- - +
+
-
- {{ item.localRemote }} + + +
+
-
-
- {{ item.warnText }} -
+
+
-
- -
+ + +
+
-
- {{ item.frequency }}Hz + + +
+
-
-
-
- -
-
-
设备名称
-
手动控制
-
手自动切换
-
本地远程状态
-
阀关反馈
-
阀开反馈
-
-
-
{{ item.name }}
-
- - -
-
- - -
-
- {{ item.localRemote }} -
-
-
- {{ item.openStauts }} -
-
-
-
- {{ item.closeStatus }} -
-
-
-
+ +
diff --git a/src/views/centerairC/sysMonitor/index.vue b/src/views/centerairC/sysMonitor/index.vue index db032f6..e44d8ea 100644 --- a/src/views/centerairC/sysMonitor/index.vue +++ b/src/views/centerairC/sysMonitor/index.vue @@ -507,7 +507,7 @@ export default { operationConrol([data]) .then((res) => { if (res.code == 200) { - this.$modal.msgSuccess("操作成功"); + this.$modal.msgSuccess("指令下发成功!"); // 开启 loading 效果 this.loading = true; // 更新状态; diff --git a/src/views/centerairC/timeSwitch/index.vue b/src/views/centerairC/timeSwitch/index.vue index 75c8f8c..c6d3126 100644 --- a/src/views/centerairC/timeSwitch/index.vue +++ b/src/views/centerairC/timeSwitch/index.vue @@ -248,7 +248,7 @@ export default { operationConrol([data]) .then((res) => { if (res.code == 200) { - this.$modal.msgSuccess("操作成功"); + this.$modal.msgSuccess("指令下发成功!"); // 开启 loading 效果 this.loading = true; // 更新所有设备状态; diff --git a/src/views/hotWater/waterControl/index.vue b/src/views/hotWater/waterControl/index.vue index ffbce89..88b1132 100644 --- a/src/views/hotWater/waterControl/index.vue +++ b/src/views/hotWater/waterControl/index.vue @@ -558,7 +558,7 @@ export default { operationConrol([data]) .then((res) => { if (res.code == 200) { - this.$modal.msgSuccess("操作成功"); + this.$modal.msgSuccess("指令下发成功!"); // 开启 loading 效果 this.loading = true; // 更新所有设备状态;