diff --git a/src/api/model/ops.js b/src/api/model/ops.js index bba0e9a9..3587e2f0 100644 --- a/src/api/model/ops.js +++ b/src/api/model/ops.js @@ -11,6 +11,22 @@ export default { } } }, + dbbackup: { + list: { + url: `${config.API_URL}/monitor/dbbackup/`, + name: "数据库备份", + req: async function(data){ + return await http.get(this.url, data); + } + }, + deletes: { + url: `${config.API_URL}/monitor/dbbackup/`, + name: "数据库备份", + req: async function(data){ + return await http.delete(this.url, data); + } + } + }, file_logs: { list: { url: `${config.API_URL}/monitor/log/`, diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue index 05370fb6..f9f6da41 100644 --- a/src/views/bigScreen/index.vue +++ b/src/views/bigScreen/index.vue @@ -794,7 +794,8 @@ export default { that.showTime(); }, 1000); let host = window.location.host; - let jsUrl = host.indexOf('localhost')>-1?'http://222.222.144.147:6013/jsmap/jsmap.js':host+'/jsmap/jsmap.js'; + // let jsUrl = host.indexOf('localhost')>-1?'http://222.222.144.147:6013/jsmap/jsmap.js':host+'/jsmap/jsmap.js'; + let jsUrl = '/jsmap/jsmap.js'; that.loadScript('mapId',jsUrl, () => { window.map = new jsmap.JSMap({ mapType: jsmap.JSMapType.MAP_3D, @@ -1017,8 +1018,7 @@ export default { let that = this; //如果已经存在这个id,则证明已经加载过,已经有这个js文件了,可以直接执行回调里面的操作 if (document.querySelector(`#${id}`)) { - // that.ElLoading = null; - that.ElLoading.close(); + that.ElLoading = null; callback && callback() return; }else{ @@ -1169,14 +1169,14 @@ export default { if(item.id==that.audioList.id){ }else{ that.audioList = item; - that.audioSrc=item.voice_f; + that.audioSrc=item.voice; if(item.location){ window.map.flyToPosition(new jsmap.JSPoint(item.location.longitude, item.location.latitude), { range: 200,duration: 1000 }); } } }else{ that.audioList = item; - that.audioSrc = item.voice_f; + that.audioSrc = item.voice; that.music.play();//播放 } } @@ -2277,7 +2277,6 @@ export default { }, speakerPlay(){ this.speakerPlayStatus = true; - // this.music.src = this.warningData.list[0].voice_f; this.music.play();//播放 }, }, @@ -2322,6 +2321,14 @@ export default { background: rgba(48, 255, 220, 0.35); } +.el-loading-spinner .el-loading-text{ + color: #Ffa500; +} + +.el-loading-spinner .path{ + stroke: #Ffa500; +} + .el-radio.el-radio--small .el-radio__label { color: #ffffff; } @@ -3825,7 +3832,7 @@ export default { #mapContainer { width: 100%; height: 100%; - background-color: #3798ff; + background-color: #49a1ff; } #bigScreenUserTable { diff --git a/src/views/ops/server.vue b/src/views/ops/server.vue index 60a1bbf6..0ae1334a 100644 --- a/src/views/ops/server.vue +++ b/src/views/ops/server.vue @@ -48,6 +48,41 @@ + + + + + + + + + + @@ -59,6 +94,8 @@ export default { cpuData: {}, diskData: {}, memoryData: {}, + apiObj: this.$API.ops.dbbackup.list, + query: {}, }; }, mounted() { @@ -79,6 +116,22 @@ export default { this.loading = false; }); }, + resetQuery() { + this.query = {}; + }, + //删除 + async table_del(row) { + this.$API.ops.dbbackup.deletes + .req({filepaths: [row.filepath]}) + .then((res) => { + this.$message.success("删除成功"); + this.$refs.table.refresh(); + return res; + }) + .catch((err) => { + return err; + }); + }, }, }; \ No newline at end of file