From 9cad9fbc6744a14278c9438bb0c51fe898120e4e Mon Sep 17 00:00:00 2001
From: 4670101279 <tongwei19940904>
Date: Tue, 15 Nov 2022 14:09:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/index.vue            |  4 ++--
 src/views/web/camera/index.vue | 38 ++++++++++++++++++++++------------
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/views/index.vue b/src/views/index.vue
index 7fcb38f..8214b1b 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -77,7 +77,7 @@
         </div>
 
         <!-- 地图 -->
-        <div id="container" style="height: 800px;width: 100%"></div>
+        <div id="container" style="height: 840px;width: 100%"></div>
         <!-- 放大图片 -->
         <transition name="fade">
           <div id="mask" v-show="showMask" @click="showMask = false">
@@ -660,7 +660,7 @@ export default {
 
 <style scoped>
   .app-container{
-    height: 800px;
+    height: 840px;
     width: 100%;
   }
   .network_show{
diff --git a/src/views/web/camera/index.vue b/src/views/web/camera/index.vue
index a887989..892ffd1 100644
--- a/src/views/web/camera/index.vue
+++ b/src/views/web/camera/index.vue
@@ -30,6 +30,10 @@
         <el-button type="success" plain icon="el-icon-refresh" size="mini" @click="register"
           v-hasPermi="['web:camera:reboot']">重启服务</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="el-icon-refresh" size="mini" @click="restartM3u8"
+          v-hasPermi="['web:camera:m3u8']">重启视频服务</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -97,29 +101,32 @@
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
             v-hasPermi="['web:camera:remove']">删除</el-button>
 
+
+          <el-button size="mini" type="text" icon="el-icon-view" @click="playVideo(scope.row)"
+            v-hasPermi="['web:camera:net']">播放视频</el-button>
+
+
           <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
-            v-hasPermi="['web:camera:remove']">
+            v-hasPermi="['web:camera:4g']">
             <span class="el-dropdown-link">
               <i class="el-icon-d-arrow-right el-icon--right"></i>更多
             </span>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="refreshRssi" icon="el-icon-s-operation" v-hasPermi="['web:camera:remove']">
+              <el-dropdown-item command="refreshRssi" icon="el-icon-s-operation">
                 刷新4G信号</el-dropdown-item>
-              <el-dropdown-item command="openFtpCfg" icon="el-icon-setting" v-hasPermi="['web:camera:remove']">FTP配置
-              </el-dropdown-item>
-              <el-dropdown-item command="showVideo" icon="el-icon-view" v-hasPermi="['web:camera:remove']">查看视频
+              <el-dropdown-item command="openFtpCfg" icon="el-icon-setting">FTP配置
               </el-dropdown-item>
-              <el-dropdown-item command="showLog" icon="el-icon-view" v-hasPermi="['web:camera:remove']">查看日志
+              <el-dropdown-item command="showVideo" icon="el-icon-view">查看视频
               </el-dropdown-item>
-              <el-dropdown-item command="showDate" icon="el-icon-view" v-hasPermi="['web:camera:remove']">补光时间
+              <el-dropdown-item command="showLog" icon="el-icon-view">查看日志
               </el-dropdown-item>
-              <el-dropdown-item command="reboot" icon="el-icon-refresh" v-hasPermi="['web:camera:remove']">重启
+              <el-dropdown-item command="showDate" icon="el-icon-view">补光时间
               </el-dropdown-item>
-              <el-dropdown-item command="autocfg" icon="el-icon-refresh" v-hasPermi="['web:camera:remove']">自动重启配置
+              <el-dropdown-item command="reboot" icon="el-icon-refresh">重启
               </el-dropdown-item>
-              <el-dropdown-item command="setTime" icon="el-icon-refresh" v-hasPermi="['web:camera:remove']">时间校准
+              <el-dropdown-item command="autocfg" icon="el-icon-refresh">自动重启配置
               </el-dropdown-item>
-              <el-dropdown-item command="playVideo" icon="el-icon-view" v-hasPermi="['web:camera:remove']">播放视频
+              <el-dropdown-item command="setTime" icon="el-icon-refresh">时间校准
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -459,8 +466,7 @@ export default {
           accessType: null,
           brand: null
         },
-
-
+        run: false,
         width: '100px'
       },
       modelList:[
@@ -956,6 +962,12 @@ export default {
         this.$modal.msgSuccess("执行成功");
       }
     },
+    async restartM3u8() {
+      let res = await this.$axiosGet('/web/camera/retartPullM3u8');
+      if (res.code === 0) {
+        this.$modal.msgSuccess("执行成功，请等待几分钟...");
+      }
+    },
     async addMethod() {
       let res = await this.$axiosPost('/web/camera/add', this.form);
       if (res.code === 0) {