Merge branch 'main' of http://182.92.203.107:3000/libingkun/skyeyesystem

frontend/Skyeye-sys-ui/src/api/device.js

@@ -39,5 +39,9 @@ export const uavSave = params =>
 export const uavUpdate = params =>
   req('post', '/skyeye/uav/update', params)
 // #endregion
-export const getLastStatus = params =>
+// 雷达开启
-  req('get', '/skyeye/payload/getLastStatus', params)
+export const deviceControlTurnon = params =>
+  req('post', '/sar/control/turnon', params)
+// 雷达关闭
+export const deviceControlEndall = params =>
+  req('post', '/sar/control/endall', params)

frontend/Skyeye-sys-ui/src/styles/element.scss

@@ -1062,3 +1062,9 @@
     color: $--color-text-4;
   }
 }
+
+.el-tooltip__popper.is-light {
+  background: #fff !important;
+  border: 1px solid #c1c1c1 !important;
+  color: #333;
+}

frontend/Skyeye-sys-ui/src/views/home/components/device1-manage/index.js

@@ -17,7 +17,9 @@ import {
   uavList,
   getUavEnableList,
   uavSave,
-  uavUpdate
+  uavUpdate,
+  deviceControlTurnon,
+  deviceControlEndall,
 } from '@/api/device'
 let taskListResource = []
 export default {
@@ -123,6 +125,29 @@ export default {
   beforeDestroy() {
   },
   methods: {
+    // 操作雷达
+    async handleRadar(row, type) {
+      if (type === 1) {
+        deviceControlTurnon({ payloadId: row.id }).then(res => {
+          if (res.data.code === 200) {
+            this.$message.success('雷达开机成功')
+          }
+        })
+      } else if (type === 2) {
+        const bool = await this.$confirm(`确认要关机吗?`, '提示', {
+          customClass: 'confirm-light',
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+        if (!bool) return;
+        deviceControlEndall({ payloadId: row.id }).then(res => {
+          if (res.data.code === 200) {
+            this.$message.success('雷达关机成功')
+          }
+        })
+      }
+    },
     payloadPage() {
       payloadList().then(res => {
         if (res.data.code === 200) {

frontend/Skyeye-sys-ui/src/views/home/components/device1-manage/index.scss

@@ -297,6 +297,15 @@
       }
     }
   }
+
+  ::v-deep .el-button.is-circle {
+    padding: 7px 8px !important;
+
+    i {
+      position: relative;
+      top: 1px;
+    }
+  }
 }
 
 .resource-list__large {

frontend/Skyeye-sys-ui/src/views/home/components/device1-manage/index.vue

@@ -96,6 +96,12 @@
 
       <el-table-column label="操作" width="200">
         <template slot-scope="scope">
+          <el-tooltip
+            class="item"
+            effect="light"
+            content="修改"
+            placement="top"
+          >
             <el-button
               type="primary"
               icon="el-icon-edit"
@@ -103,6 +109,43 @@
               circle
               @click="editDevice(scope.row)"
             ></el-button>
+          </el-tooltip>
+          <template v-if="queryForm.type === 'payload'">
+            <el-tooltip
+              class="item"
+              effect="light"
+              content="开机"
+              placement="top"
+            >
+              <el-button
+                type="success"
+                icon="el-icon-video-play"
+                size="mini"
+                circle
+                @click="handleRadar(scope.row, 1)"
+              ></el-button>
+            </el-tooltip>
+
+            <el-tooltip
+              class="item"
+              effect="light"
+              content="关机"
+              placement="top"
+            >
+              <el-button
+                icon="el-icon-switch-button"
+                size="mini"
+                circle
+                @click="handleRadar(scope.row, 2)"
+              ></el-button>
+            </el-tooltip>
+          </template>
+          <el-tooltip
+            class="item"
+            effect="light"
+            content="删除"
+            placement="top"
+          >
             <el-button
               type="danger"
               icon="el-icon-delete"
@@ -110,6 +153,7 @@
               circle
               @click="deleteDevice(scope.row)"
             ></el-button>
+          </el-tooltip>
         </template>
       </el-table-column>
     </el-table>

frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.js

@@ -2998,7 +2998,7 @@ export default {
       }
     },
     handleWebsocketState(info) {
-      console.log('整体状态变更', JSON.parse(info.body))
+      // console.log('整体状态变更', JSON.parse(info.body))
       let data = JSON.parse(info.body)
       // TODO 待测试
       // airlineId  airlineStatus jobId  jobStatus  payloadStatus payloadId  uavId