diff --git a/src/views/alarmHandling/index.vue b/src/views/alarmHandling/index.vue
index 98c8f51..fe6e554 100644
--- a/src/views/alarmHandling/index.vue
+++ b/src/views/alarmHandling/index.vue
@@ -165,7 +165,7 @@
-
+ 主动拍照
历史图片
@@ -387,36 +387,50 @@ export default {
//手动拍照
handleCommandpic() {
this.btnpicloading = true;
- getLatestPhotoJoggle({}).then((res) => {
+ getLatestPhotoJoggle({
+ captureType: 0,
+ channel: this.selectRow.channelId,
+ termId: this.selectRow.termId,
+ preset: 255,
+ }).then((res) => {
this.$message({
showClose: true,
message: "手动拍照请求成功!",
type: "success",
});
this.timer = window.setInterval(() => {
- this.newPicApi();
+ this.newPicApi(res.data);
this.i++;
}, 5000);
});
},
//获取最新图片
- newPicApi() {
- getReturnedPhotoJoggle({}).then((res) => {
+ newPicApi(val) {
+ getReturnedPhotoJoggle({
+ photoTime: val,
+ termId: this.selectRow.termId,
+ }).then((res) => {
if (res.data == true && this.i < 10) {
clearInterval(this.timer);
this.timer = null;
this.i = 0;
this.btnpicloading = false;
- console.log("返回最新图片");
+ this.$notify({
+ title: '通知信息',
+ message: '已返回最新图片',
+ type: 'success',
+ position: 'bottom-right'
+ });
} else if (res.data == false && this.i > 10) {
clearInterval(this.timer);
this.timer = null;
this.i = 0;
this.btnpicloading = false;
- this.$message({
- showClose: true,
- message: "装置暂无响应,请稍后再试!",
- type: "warning",
+ this.$notify({
+ title: '通知信息',
+ message: '装置暂无响应,请稍后再试!',
+ type: 'warning',
+ position: 'bottom-right'
});
}
});
diff --git a/vue.config.js b/vue.config.js
index 3e6b409..51f9db9 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -28,11 +28,11 @@ module.exports = defineConfig({
proxy: {
"/api": {
//表示拦截以/api开头的请求路径
- //target: "http://47.96.238.157:8093", //阿里云服务器环境
- target: "http://180.166.218.222:40080", //dell
+ target: "http://47.96.238.157:8093", //阿里云服务器环境
+ // target: "http://180.166.218.222:40080", //dell
changOrigin: true, //是否开启跨域
pathRewrite: {
- "^/api": "/api", //重写api,把api变成空字符,因为我们真正请求的路径是没有api的
+ "^/api": "", //重写api,把api变成空字符,因为我们真正请求的路径是没有api的
},
},
},