From f41ad2f5ca6e4f2fbcea215938e7f627be8c4817 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Thu, 15 Jun 2023 14:35:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=8A=B6=E6=80=81=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE=E7=A4=BA=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/api/index.js              |  12 ++
 src/views/pictureRotation/index.vue |   6 +-
 src/views/realTimeMonitor/index.vue | 218 ++++++++++++++++------------
 vue.config.js                       |   2 +-
 4 files changed, 147 insertions(+), 91 deletions(-)

diff --git a/src/utils/api/index.js b/src/utils/api/index.js
index d816fa9..80ce745 100644
--- a/src/utils/api/index.js
+++ b/src/utils/api/index.js
@@ -684,3 +684,15 @@ export function updateMarkEnableStatus(data) {
     },
   });
 }
+
+///api/getTermStatus
+export function getTermStatus(data) {
+  return request({
+    url: "/api/getTermStatus",
+    method: "post",
+    data,
+    headers: {
+      "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
+    },
+  });
+}
diff --git a/src/views/pictureRotation/index.vue b/src/views/pictureRotation/index.vue
index 9c36fae..de82913 100644
--- a/src/views/pictureRotation/index.vue
+++ b/src/views/pictureRotation/index.vue
@@ -48,7 +48,11 @@
           <img src="../../assets/img/nopic.jpg" />
         </div>
         <p class="infoTop">
-          {{ item.linename }}-{{ item.displayname }}-{{
+          {{ item.linename }}-{{
+            item.displayname !== null && item.displayname !== ""
+              ? item.displayname
+              : item.cmdid
+          }}-{{
             item.alias !== null && item.alias !== ""
               ? item.alias
               : item.channnelname
diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue
index ceff47d..ae7e6f3 100644
--- a/src/views/realTimeMonitor/index.vue
+++ b/src/views/realTimeMonitor/index.vue
@@ -114,11 +114,7 @@
             <h3>操作项</h3>
             <div class="buttonGroup">
               <el-dropdown trigger="click" @command="handleCommandpic">
-                <el-button
-                  type="primary"
-                  :loading="btnpicloading"
-                  :disabled="zzstatus == 0"
-                >
+                <el-button type="primary" :loading="btnpicloading">
                   主动拍照<i class="el-icon-arrow-down el-icon--right"></i>
                 </el-button>
                 <el-dropdown-menu slot="dropdown" class="picdropStyle">
@@ -135,11 +131,7 @@
                 </el-dropdown-menu>
               </el-dropdown>
               <el-dropdown trigger="click" @command="handleCommandvideo">
-                <el-button
-                  type="primary"
-                  :loading="btnvideoloading"
-                  :disabled="zzstatus == 0"
-                >
+                <el-button type="primary" :loading="btnvideoloading">
                   主动录像<i class="el-icon-arrow-down el-icon--right"></i>
                 </el-button>
                 <el-dropdown-menu slot="dropdown" class="videodropStyle">
@@ -156,17 +148,10 @@
                 </el-dropdown-menu>
               </el-dropdown>
 
-              <el-button
-                type="primary"
-                @click="handleShowInfo"
-                :disabled="zzstatus == 0"
-              >
+              <el-button type="primary" @click="handleShowInfo">
                 装置信息</el-button
               >
-              <el-button
-                type="primary"
-                @click.native.stop="handleSetSchedule()"
-                :disabled="zzstatus == 0"
+              <el-button type="primary" @click.native.stop="handleSetSchedule()"
                 >拍照时间表</el-button
               >
               <!-- <el-dropdown
@@ -187,7 +172,7 @@
                 trigger="click"
                 @command="handleCommandWarn"
               >
-                <el-button type="primary" :disabled="zzstatus == 0">
+                <el-button type="primary">
                   声光报警<i class="el-icon-arrow-down el-icon--right"></i>
                 </el-button>
                 <el-dropdown-menu slot="dropdown" class="gpsdropStyle">
@@ -231,6 +216,7 @@ import {
   getLatestPhotoJoggle,
   getReturnedPhotoJoggle,
   alarmMarkJoggle,
+  getTermStatus,
 } from "@/utils/api/index";
 import { mapState } from "vuex";
 import carouselChart from "../components/carouselChart.vue";
@@ -537,35 +523,51 @@ export default {
     handleWarn(val) {
       console.log("声光报警");
       console.log(this.cmdid);
-      alarmMarkJoggle({ cmdId: this.cmdid, ctrl: val })
-        .then((res) => {
-          console.log(res);
-          if (res.code == 200) {
-            if (val == 1) {
-              this.$message({
-                duration: 1500,
-                showClose: true,
-                message: "声光报警开启成功",
-                type: "success",
-              });
-            } else {
+      getTermStatus({ termId: this.newTermId }).then((res) => {
+        console.log(res);
+        if (res.data.isonline) {
+          alarmMarkJoggle({
+            cmdId: this.cmdid,
+            ctrl: val,
+            termId: this.newTermId,
+          })
+            .then((res) => {
+              console.log(res);
+              if (res.code == 200) {
+                if (val == 1) {
+                  this.$message({
+                    duration: 1500,
+                    showClose: true,
+                    message: "声光报警开启成功",
+                    type: "success",
+                  });
+                } else {
+                  this.$message({
+                    duration: 1500,
+                    showClose: true,
+                    message: "声光报警关闭成功",
+                    type: "success",
+                  });
+                }
+              }
+            })
+            .catch((err) => {
               this.$message({
                 duration: 1500,
                 showClose: true,
-                message: "声光报警关闭成功",
-                type: "success",
+                message: "声光报警操作失败",
+                type: "error",
               });
-            }
-          }
-        })
-        .catch((err) => {
+            });
+        } else {
           this.$message({
             duration: 1500,
             showClose: true,
-            message: "声光报警操作失败",
+            message: "装置下线，发送指令失败",
             type: "error",
           });
-        });
+        }
+      });
     },
     //线缆显示
     handleCommandLine(command) {
@@ -590,66 +592,92 @@ export default {
 
     //手动拍照
     handleCommandpic(command) {
-      this.btnpicloading = true;
       console.log(command);
-      getLatestPhotoJoggle({
-        captureType: 0,
-        channel: command,
-        // cmdid: this.cmdid,
-        termId: this.newTermId,
-        preset: 255,
-      })
-        .then((res) => {
+      getTermStatus({ termId: this.newTermId }).then((res) => {
+        console.log(res);
+        if (res.data.isonline) {
+          this.btnpicloading = true;
+          getLatestPhotoJoggle({
+            captureType: 0,
+            channel: command,
+            // cmdid: this.cmdid,
+            termId: this.newTermId,
+            preset: 255,
+          })
+            .then((res) => {
+              this.$message({
+                duration: 1500,
+                showClose: true,
+                message: "手动拍照请求成功！",
+                type: "success",
+              });
+              console.log(res);
+              this.newPicData = res.data;
+              console.log(this.newPicData);
+              console.log(this.newTermId);
+
+              this.timer = window.setInterval(() => {
+                this.newPicApi();
+                this.i++;
+              }, 5000);
+            })
+            .catch((err) => {
+              console.log(err); //代码错误、请求失败捕获
+            });
+        } else {
+          this.btnpicloading = false;
           this.$message({
             duration: 1500,
             showClose: true,
-            message: "手动拍照请求成功！",
-            type: "success",
+            message: "装置下线，发送指令失败",
+            type: "error",
           });
-          console.log(res);
-          this.newPicData = res.data;
-          console.log(this.newPicData);
-          console.log(this.newTermId);
-
-          this.timer = window.setInterval(() => {
-            this.newPicApi();
-            this.i++;
-          }, 5000);
-        })
-        .catch((err) => {
-          console.log(err); //代码错误、请求失败捕获
-        });
+        }
+      });
     },
     //手动拍视频
     handleCommandvideo(command) {
       console.log(command);
-      this.btnvideoloading = true;
-      getLatestPhotoJoggle({
-        captureType: 1,
-        channel: command,
-        //cmdid: this.cmdid,
-        termId: this.newTermId,
-        preset: 255,
-      })
-        .then((res) => {
+
+      getTermStatus({ termId: this.newTermId }).then((res) => {
+        console.log(res);
+        if (res.data.isonline) {
+          this.btnvideoloading = true;
+          getLatestPhotoJoggle({
+            captureType: 1,
+            channel: command,
+            //cmdid: this.cmdid,
+            termId: this.newTermId,
+            preset: 255,
+          })
+            .then((res) => {
+              this.$message({
+                duration: 1500,
+                showClose: true,
+                message: "手动拍视频请求成功！",
+                type: "success",
+              });
+              console.log(res);
+              this.newPicData = res.data;
+              console.log(this.newPicData);
+              console.log(this.newTermId);
+              this.timer = window.setInterval(() => {
+                this.newPicApi();
+                this.i++;
+              }, 10000);
+            })
+            .catch((err) => {
+              console.log(err); //代码错误、请求失败捕获
+            });
+        } else {
           this.$message({
             duration: 1500,
             showClose: true,
-            message: "手动拍视频请求成功！",
-            type: "success",
+            message: "装置下线，发送指令失败",
+            type: "error",
           });
-          console.log(res);
-          this.newPicData = res.data;
-          console.log(this.newPicData);
-          console.log(this.newTermId);
-          this.timer = window.setInterval(() => {
-            this.newPicApi();
-            this.i++;
-          }, 10000);
-        })
-        .catch((err) => {
-          console.log(err); //代码错误、请求失败捕获
-        });
+        }
+      });
     },
     //手动拍照
     // handleShowPic() {
@@ -725,8 +753,20 @@ export default {
 
     //装置信息handleShowInfo
     handleShowInfo() {
-      this.$refs.infodialog_ref.display();
-      this.$refs.infodialog_ref.getListData(this.channelId, this.cmdid);
+      getTermStatus({ termId: this.newTermId }).then((res) => {
+        console.log(res);
+        if (res.data.isonline) {
+          this.$refs.infodialog_ref.display();
+          this.$refs.infodialog_ref.getListData(this.channelId, this.cmdid);
+        } else {
+          this.$message({
+            duration: 1500,
+            showClose: true,
+            message: "装置下线，发送指令失败",
+            type: "error",
+          });
+        }
+      });
     },
     //历史图片
     // handlehistoryPic() {
diff --git a/vue.config.js b/vue.config.js
index 51f9db9..e3ab0d5 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -29,7 +29,7 @@ module.exports = defineConfig({
       "/api": {
         //表示拦截以/api开头的请求路径
         target: "http://47.96.238.157:8093", //阿里云服务器环境
-        // target: "http://180.166.218.222:40080", //dell
+        //target: "http://180.166.218.222:40080", //dell
         changOrigin: true, //是否开启跨域
         pathRewrite: {
           "^/api": "", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的