diff --git a/src/api/deviceConsole/index.js b/src/api/deviceConsole/index.js deleted file mode 100644 index 14ccd66..0000000 --- a/src/api/deviceConsole/index.js +++ /dev/null @@ -1,9 +0,0 @@ -import request from '@/utils/request' - -// 获取用户详细信息 -export function devices() { - return request({ - url: '/device/devices', - method: 'get' - }) -} \ No newline at end of file diff --git a/src/assets/font/Ayuthaya.ttf b/src/assets/font/Ayuthaya.ttf new file mode 100644 index 0000000..e051e29 Binary files /dev/null and b/src/assets/font/Ayuthaya.ttf differ diff --git a/src/assets/font/font.css b/src/assets/font/font.css new file mode 100644 index 0000000..5e2aaca --- /dev/null +++ b/src/assets/font/font.css @@ -0,0 +1,7 @@ +/* // 这是 font.css 可设置多种字体; */ +/* // 注意:font-family: 'XXX'; 将字体名字自定义为 XXX,使用时要用这个名字 */ + +@font-face { + font-family: 'Ayuthaya'; + src: url('./Ayuthaya.ttf'); +} \ No newline at end of file diff --git a/src/views/deviceConsole/machine/index.vue b/src/views/deviceConsole/machine/index.vue index da26bf2..d15abdb 100644 --- a/src/views/deviceConsole/machine/index.vue +++ b/src/views/deviceConsole/machine/index.vue @@ -27,16 +27,20 @@ -
- - + +
-
+
import axios from "axios"; +import "@/assets/font/font.css"; export default { data() { return { @@ -458,7 +463,7 @@ export default { // 遮罩层 loading: true, id: "", - imgdata:true, + imgdata: true, timer: null, img: require("../../../assets/images/close.png"), imgs: require("../../../assets/images/open.png"), @@ -516,11 +521,14 @@ export default { }, }) .then((res) => { - this.imgdata = true + this.imgdata = true; this.$modal.msgSuccess("停止成功"); }); } else { - this.$modal.msgSuccess("请选择设备"); + this.$message({ + message: "请选择设备", + type: "warning", + }); } }, on() { @@ -533,18 +541,25 @@ export default { }, }) .then((res) => { - this.imgdata = false + this.imgdata = false; this.$modal.msgSuccess("启动成功"); }); } else { - this.$modal.msgSuccess("请选择设备"); + this.$message({ + message: "请选择设备", + type: "warning", + }); } }, }, }; -