From b91b061f2396a47ce2a2098ac90459cce13f098e Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Tue, 9 May 2023 17:10:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2api=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/api/index.js                        | 83 +++++++++----------
 .../realTimeMonitor/components/infoDialog.vue |  2 +-
 .../components/setschedule.vue                | 51 ++++++++++--
 src/views/realTimeMonitor/index.vue           | 18 +++-
 4 files changed, 103 insertions(+), 51 deletions(-)

diff --git a/src/utils/api/index.js b/src/utils/api/index.js
index 7468f75..33bfed3 100644
--- a/src/utils/api/index.js
+++ b/src/utils/api/index.js
@@ -4,7 +4,7 @@ import request from "../request";
 //获取线路树状结构
 export function getdyTreeListJoggle(data) {
   return request({
-    url: "/test/getdyTreeList",
+    url: "/api/getdyTreeList",
     method: "post",
     data,
   });
@@ -12,7 +12,7 @@ export function getdyTreeListJoggle(data) {
 //获取图片接口
 export function getTerminalPhotoListJoggle(data) {
   return request({
-    url: "/test/getTerminalPhotoList",
+    url: "/api/getTerminalPhotoList",
     method: "post",
     data,
   });
@@ -21,7 +21,7 @@ export function getTerminalPhotoListJoggle(data) {
 
 export function getChannelListJoggle(data) {
   return request({
-    url: "/test/getChannelByTermid",
+    url: "/api/getChannelByTermid",
     method: "post",
     data,
   });
@@ -30,7 +30,7 @@ export function getChannelListJoggle(data) {
 
 export function getChannelByTermidJoggle(data) {
   return request({
-    url: "/test/getChannelByTermid",
+    url: "/api/getChannelByTermid",
     method: "post",
     data,
   });
@@ -40,7 +40,7 @@ export function getChannelByTermidJoggle(data) {
 //获取图片轮巡接口
 export function getPictureList(data) {
   return request({
-    url: "/test/getPhotoBanner",
+    url: "/api/getPhotoBanner",
     method: "post",
     data,
   });
@@ -50,26 +50,25 @@ export function getPictureList(data) {
 //获取电压-线路-杆塔等信息
 export function getSearchInfo(data) {
   return request({
-    url: "/test/getLineAndGt",
+    url: "/api/getLineAndGt",
     method: "post",
     data,
   });
 }
 //获取实时图片数据
-export function getRealtimePhoto(data){
+export function getRealtimePhoto(data) {
   return request({
-    url: "/test/getPhotoList",
+    url: "/api/getPhotoList",
     method: "post",
-    data
-  })
+    data,
+  });
 }
 
-
 //杆塔信息
 //1.获取杆塔列表
 export function getTowerListApi(data) {
   return request({
-    url: "/test/getTowerList",
+    url: "/api/getTowerList",
     method: "post",
     data,
   });
@@ -77,7 +76,7 @@ export function getTowerListApi(data) {
 //2.获取线路编号列表
 export function getLineListApi(data) {
   return request({
-    url: "/test/getLineList",
+    url: "/api/getLineList",
     method: "post",
     data,
   });
@@ -85,7 +84,7 @@ export function getLineListApi(data) {
 //3.新增杆塔信息
 export function addTowerApi(data) {
   return request({
-    url: "/test/addTower",
+    url: "/api/addTower",
     method: "post",
     data,
   });
@@ -93,7 +92,7 @@ export function addTowerApi(data) {
 //4.修改杆塔信息
 export function updateTowerApi(data) {
   return request({
-    url: "/test/updateTower",
+    url: "/api/updateTower",
     method: "post",
     data,
   });
@@ -101,7 +100,7 @@ export function updateTowerApi(data) {
 //5.删除杆塔信息
 export function delTowerApi(data) {
   return request({
-    url: "/test/deleteTower",
+    url: "/api/deleteTower",
     method: "post",
     data,
   });
@@ -111,7 +110,7 @@ export function delTowerApi(data) {
 //1.获取任务规则列表接口
 export function getScheduleRulelListJoggle(data) {
   return request({
-    url: "/test/getScheduleRulelList",
+    url: "/api/getScheduleRulelList",
     method: "post",
     data,
   });
@@ -119,7 +118,7 @@ export function getScheduleRulelListJoggle(data) {
 //2.新增任务规则
 export function addScheduleRulel(data) {
   return request({
-    url: "/test/addSchelduleRuleList",
+    url: "/api/addSchelduleRuleList",
     method: "post",
     data,
   });
@@ -127,7 +126,7 @@ export function addScheduleRulel(data) {
 //3.删除任务规则
 export function deleteScheduleRulel(data) {
   return request({
-    url: "/test/deleteSchelduleRule",
+    url: "/api/deleteSchelduleRule",
     method: "post",
     data,
   });
@@ -135,7 +134,7 @@ export function deleteScheduleRulel(data) {
 //4.修改任务规则
 export function updateScheduleRulel(data) {
   return request({
-    url: "/test/updateSchelduleRule",
+    url: "/api/updateSchelduleRule",
     method: "post",
     data,
   });
@@ -143,7 +142,7 @@ export function updateScheduleRulel(data) {
 //5.获取所有通道
 export function getScheduleRulelAccessList(data) {
   return request({
-    url: "/test/getChannelTreeList",
+    url: "/api/getChannelTreeList",
     method: "post",
     data,
   });
@@ -151,7 +150,7 @@ export function getScheduleRulelAccessList(data) {
 //6.设置时间表通道
 export function setScheduleRulel(data) {
   return request({
-    url: "/test/relateSchelduleRule",
+    url: "/api/relateSchelduleRule",
     method: "post",
     data,
   });
@@ -159,7 +158,7 @@ export function setScheduleRulel(data) {
 //7.查询设备时间表
 export function getSchedulenr(data) {
   return request({
-    url: "/test/getChannelSchelduleRule",
+    url: "/api/getChannelSchelduleRule",
     method: "post",
     data,
   });
@@ -169,7 +168,7 @@ export function getSchedulenr(data) {
 //1.获取通道列表
 export function getChannelListapi(data) {
   return request({
-    url: "/test/getChannelList",
+    url: "/api/getChannelList",
     method: "post",
     data,
   });
@@ -177,7 +176,7 @@ export function getChannelListapi(data) {
 //2.新增通道
 export function addChannelapi(data) {
   return request({
-    url: "/test/addChannelList",
+    url: "/api/addChannelList",
     method: "post",
     data,
   });
@@ -185,7 +184,7 @@ export function addChannelapi(data) {
 //3.删除通道
 export function deleteChannelapi(data) {
   return request({
-    url: "/test/deleteChannelList",
+    url: "/api/deleteChannelList",
     method: "post",
     data,
   });
@@ -193,7 +192,7 @@ export function deleteChannelapi(data) {
 //4.修改通道
 export function updateChannelapi(data) {
   return request({
-    url: "/test/updateChannelList",
+    url: "/api/updateChannelList",
     method: "post",
     data,
   });
@@ -203,7 +202,7 @@ export function updateChannelapi(data) {
 //获取电压等级列表
 export function getdyListJoggle(data) {
   return request({
-    url: "/test/getdyList",
+    url: "/api/getdyList",
     method: "post",
     data,
   });
@@ -211,7 +210,7 @@ export function getdyListJoggle(data) {
 //1.线路列表信息
 export function getLineListJoggle(data) {
   return request({
-    url: "/test/getLineList",
+    url: "/api/getLineList",
     method: "post",
     data,
   });
@@ -219,7 +218,7 @@ export function getLineListJoggle(data) {
 //2.添加单个或者多个线路信息
 export function addLineJoggle(data) {
   return request({
-    url: "/test/addLine",
+    url: "/api/addLine",
     method: "post",
     data,
   });
@@ -227,7 +226,7 @@ export function addLineJoggle(data) {
 //3.删除新路信息
 export function deleteLineJoggle(data) {
   return request({
-    url: "/test/deleteLine",
+    url: "/api/deleteLine",
     method: "post",
     data,
   });
@@ -235,7 +234,7 @@ export function deleteLineJoggle(data) {
 //4.修改信息
 export function updateLineJoggle(data) {
   return request({
-    url: "/test/updateLine",
+    url: "/api/updateLine",
     method: "post",
     data,
   });
@@ -245,7 +244,7 @@ export function updateLineJoggle(data) {
 //获取列表
 export function getTerminalJoggle(data) {
   return request({
-    url: "/test/getTerminalList",
+    url: "/api/getTerminalList",
     method: "post",
     data,
   });
@@ -254,7 +253,7 @@ export function getTerminalJoggle(data) {
 
 export function addTerminalJoggle(data) {
   return request({
-    url: "/test/addTerminal",
+    url: "/api/addTerminal",
     method: "post",
     data,
   });
@@ -263,7 +262,7 @@ export function addTerminalJoggle(data) {
 
 export function updateTerminalJoggle(data) {
   return request({
-    url: "/test/updateTerminal",
+    url: "/api/updateTerminal",
     method: "post",
     data,
   });
@@ -272,7 +271,7 @@ export function updateTerminalJoggle(data) {
 
 export function deleteTerminalJoggle(data) {
   return request({
-    url: "/test/deleteTerminal",
+    url: "/api/deleteTerminal",
     method: "post",
     data,
   });
@@ -281,7 +280,7 @@ export function deleteTerminalJoggle(data) {
 //图像采集装置设置 列表
 export function getImageResolutionListJoggle(data) {
   return request({
-    url: "/test/getImageResolutionList",
+    url: "/api/getImageResolutionList",
     method: "post",
     data,
   });
@@ -294,7 +293,7 @@ export function getImageResolutionListJoggle(data) {
 // 获取GPS位置
 export function getTermGPSJoggle(data) {
   return request({
-    url: "/test/getTermGPS",
+    url: "/api/getTermGPS",
     method: "post",
     data,
   });
@@ -302,7 +301,7 @@ export function getTermGPSJoggle(data) {
 //setTermGPS 开启关闭gps
 export function setTermGPSJoggle(data) {
   return request({
-    url: "/test/setTermGPS",
+    url: "/api/setTermGPS",
     method: "post",
     data,
   });
@@ -311,7 +310,7 @@ export function setTermGPSJoggle(data) {
 //手动拍照
 export function getLatestPhotoJoggle(data) {
   return request({
-    url: "/test/getLatestPhoto",
+    url: "/api/getLatestPhoto",
     method: "post",
     data,
   });
@@ -321,7 +320,7 @@ export function getLatestPhotoJoggle(data) {
 
 export function getAllChannelListJoggle(data) {
   return request({
-    url: "/test/getAllChannelList",
+    url: "/api/getAllChannelList",
     method: "post",
     data,
   });
@@ -331,7 +330,7 @@ export function getAllChannelListJoggle(data) {
 
 export function getAllTowerJoggle(data) {
   return request({
-    url: "/test/getAllTower",
+    url: "/api/getAllTower",
     method: "post",
     data,
   });
diff --git a/src/views/realTimeMonitor/components/infoDialog.vue b/src/views/realTimeMonitor/components/infoDialog.vue
index ea6ef6a..989766e 100644
--- a/src/views/realTimeMonitor/components/infoDialog.vue
+++ b/src/views/realTimeMonitor/components/infoDialog.vue
@@ -7,7 +7,7 @@
     width="50%"
   >
     <div class="infoTable">
-      <el-descriptions class="margin-top" :column="3" border>
+      <el-descriptions class="margin-top" :column="1" border>
         <el-descriptions-item>
           <template slot="label"> 图像监测装置 ID </template>
           XYIGQ10C230300104
diff --git a/src/views/realTimeMonitor/components/setschedule.vue b/src/views/realTimeMonitor/components/setschedule.vue
index 2ad844e..e7821bd 100644
--- a/src/views/realTimeMonitor/components/setschedule.vue
+++ b/src/views/realTimeMonitor/components/setschedule.vue
@@ -4,7 +4,7 @@
     title="时间表设置"
     :visible.sync="isShow"
     :close-on-click-modal="false"
-    width="680px"
+    width="60%"
   >
     <el-tabs v-model="activeName" @tab-click="handleClick" v-loading="loading">
       <el-tab-pane label="查询实际时间表" name="1">
@@ -43,9 +43,31 @@
             style="width: 100%"
             height="calc(100% - 40px)"
           >
+            <el-table-column label="名称" show-overflow-tooltip>
+              <template slot-scope="scope">{{ scope.row.name }}</template>
+            </el-table-column>
             <el-table-column label="时间表类型" show-overflow-tooltip>
               <template>时间表类型</template>
             </el-table-column>
+            <el-table-column label="时间表规则" width="600">
+              <template slot-scope="scope">
+                <ul
+                  class="rulesBox"
+                  v-for="(item, value) in scope.row.list"
+                  :key="value"
+                >
+                  <li><span>开始时间：</span>{{ item.startTime }}</li>
+                  <li><span>结束时间：</span>{{ item.endTime }}</li>
+                  <li>
+                    <span>时间间隔（分）:</span>
+                    <el-tag>{{ item.span }}</el-tag>
+                  </li>
+                </ul>
+              </template>
+            </el-table-column>
+            <!-- <el-table-column label="时间表类型" show-overflow-tooltip>
+              <template>时间表类型</template>
+            </el-table-column>
             <el-table-column
               prop="startTime"
               label="开始时间"
@@ -60,7 +82,7 @@
               prop="span"
               label="间隔（分）"
               show-overflow-tooltip
-            ></el-table-column>
+            ></el-table-column> -->
             <el-table-column
               prop="remark"
               label="备注"
@@ -322,7 +344,7 @@ export default {
 <style lang="less">
 .setTimeDialog {
   .el-tabs__content {
-    height: 280px;
+    height: 400px;
     overflow: auto;
     .el-tab-pane {
       height: calc(100% - 16px);
@@ -353,7 +375,9 @@ export default {
     width: 8%;
   }
   .w80 {
-    width: 80%;
+    width: 90%;
+    overflow-y: auto;
+    height: 300px;
   }
   .mr20 {
     margin-right: 20px;
@@ -364,11 +388,28 @@ export default {
   .deviceTable {
     padding: 16px 8px 0 8px;
     height: calc(100% - 16px);
+    .rulesBox {
+      display: flex;
+      flex-direction: row;
+      li {
+        list-style: none;
+        margin-right: 24px;
+        line-height: 24px;
+        span {
+          margin-right: 4px;
+        }
+        .el-tag--small {
+          height: 16px;
+          padding: 0 8px;
+          line-height: 16px;
+        }
+      }
+    }
   }
 }
 .setRoadDialog {
   .el-dialog__body {
-    height: 280px;
+    height: 400px;
     overflow: auto;
     .el-form {
       height: 100%;
diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue
index 6cbf443..e5babf7 100644
--- a/src/views/realTimeMonitor/index.vue
+++ b/src/views/realTimeMonitor/index.vue
@@ -83,7 +83,7 @@
               <el-button type="primary" @click="handleShowGPS"
                 >获取GPS位置</el-button
               >
-              <el-button type="primary" @click="handleShowErr">
+              <el-button type="primary" @click="handleShowInfo">
                 装置信息</el-button
               >
               <el-dropdown
@@ -110,6 +110,7 @@
         </div>
       </div>
       <setschedule ref="setschedule_ref"></setschedule>
+      <info-dialog ref="infodialog_ref"></info-dialog>
     </div>
   </div>
 </template>
@@ -127,12 +128,14 @@ import carouselChart from "../components/carouselChart.vue";
 import setschedule from "./components/setschedule.vue";
 import deviceUpgrade from "./components/deviceUpgrade.vue";
 import pictureTags from "./components/pictureTags.vue";
+import infoDialog from "./components/infoDialog.vue";
 export default {
   components: {
     carouselChart,
     setschedule,
     deviceUpgrade,
     pictureTags,
+    infoDialog,
   },
   data() {
     return {
@@ -232,6 +235,7 @@ export default {
         this.$refs.tree.setCurrentKey(data.list[0].id);
       }
       this.channelId = data.id; //获取当前点击的id
+      this.cmdid = data.cmdid;
       this.channelValue = [];
       this.channelOption = [];
       this.getChannelList(this.channelId); //获取通道id接口
@@ -376,21 +380,29 @@ export default {
     },
     //手动拍照
     handleShowPic() {
-      console.log(this.channelId);
+      console.log(this.channelValue[0]);
       console.log(this.cmdid);
       getLatestPhotoJoggle({
         captureType: 0,
-        channel: this.channelId,
+        channel: this.channelValue[0],
         cmdid: this.cmdid,
         preset: 255,
       })
         .then((res) => {
+          this.$message({
+            message: "自动拍照请求成功！",
+            type: "success",
+          });
           console.log(res);
         })
         .catch((err) => {
           console.log(err); //代码错误、请求失败捕获
         });
     },
+    //装置信息handleShowInfo
+    handleShowInfo() {
+      this.$refs.infodialog_ref.display();
+    },
     //历史图片
     // handlehistoryPic() {
     //   this.$router.push({ path: "/realTimeSearch" });