摄像机日志

src/views/data/currdata/index.vue

@@ -49,8 +49,8 @@
     <pagination
       v-show="total"
       :total="total"
-      :page.sync="queryParams.pageNum"
+      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
+      :limit.sync="queryParams.limit"
       @pagination="getList"
     />
 
@@ -120,8 +120,8 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
-        pageNum: 1,
+        page: 1,
-        pageSize: 10,
+        limit: 10,
         stnmId: null,
         stnm: null,
         mainType: null,
@@ -218,7 +218,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
+      this.queryParams.page = 1;
       this.getList();
     },
     /** 重置按钮操作 */

src/views/web/camera/index.vue

@@ -2,20 +2,10 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="设备名" prop="name">
-        <el-input
+        <el-input v-model="queryParams.name" placeholder="请输入设备名" clearable @keyup.enter.native="handleQuery" />
-          v-model="queryParams.name"
-          placeholder="请输入设备名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <el-form-item label="序列号" prop="devsn">
-        <el-input
+        <el-input v-model="queryParams.devsn" placeholder="请输入设备序列号" clearable @keyup.enter.native="handleQuery" />
-          v-model="queryParams.devsn"
-          placeholder="请输入设备序列号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -25,35 +15,16 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-          type="danger"
+          v-hasPermi="['web:camera:remove']">删除</el-button>
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['web:camera:remove']"
-        >删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-          type="warning"
+          v-hasPermi="['web:camera:export']">导出</el-button>
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['web:camera:export']"
-        >导出</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="success" plain icon="el-icon-refresh" size="mini" @click="register"
-          type="success"
+          v-hasPermi="['web:camera:reboot']">重启服务</el-button>
-          plain
-          icon="el-icon-refresh"
-          size="mini"
-          @click="register"
-          v-hasPermi="['web:camera:reboot']"
-        >重启服务</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -73,8 +44,12 @@
       <el-table-column label="4G强度" align="center" prop="rssiLevel" />
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
-            <span v-if="scope.row.status == 1"><el-tag type="success">在线</el-tag></span>
+          <span v-if="scope.row.status == 1">
-            <span v-if="scope.row.status == 0"><el-tag type="info">离线</el-tag></span>
+            <el-tag type="success">在线</el-tag>
+          </span>
+          <span v-if="scope.row.status == 0">
+            <el-tag type="info">离线</el-tag>
+          </span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -93,13 +68,8 @@
             @click="showVideo(scope.row)"
             v-hasPermi="['web:camera:remove']"
           >查看视频</el-button> -->
-          <el-button
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            size="mini"
+            v-hasPermi="['web:camera:edit']">修改</el-button>
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['web:camera:edit']"
-          >修改</el-button>
           <!--   <el-button
             size="mini"
             type="text"
@@ -108,40 +78,35 @@
             v-hasPermi="['web:camera:remove']"
             v-loading.fullscreen.lock="fullscreenLoading"
           >重启</el-button> -->
-          <el-button
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            size="mini"
+            v-hasPermi="['web:camera:remove']">删除</el-button>
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['web:camera:remove']"
-          >删除</el-button>
 
-          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['web:camera:remove']">
+          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
+            v-hasPermi="['web:camera:remove']">
             <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"
+              <el-dropdown-item command="refreshRssi" icon="el-icon-s-operation" v-hasPermi="['web:camera:remove']">
-                v-hasPermi="['web:camera:remove']">刷新4G信号</el-dropdown-item>
+                刷新4G信号</el-dropdown-item>
-              <el-dropdown-item command="openFtpCfg" icon="el-icon-setting"
+              <el-dropdown-item command="openFtpCfg" icon="el-icon-setting" v-hasPermi="['web:camera:remove']">FTP配置
-                v-hasPermi="['web:camera:remove']">FTP配置</el-dropdown-item>
+              </el-dropdown-item>
-              <el-dropdown-item command="showVideo" icon="el-icon-view"
+              <el-dropdown-item command="showVideo" icon="el-icon-view" v-hasPermi="['web:camera:remove']">查看视频
-                v-hasPermi="['web:camera:remove']">查看视频</el-dropdown-item>
+              </el-dropdown-item>
-              <el-dropdown-item command="reboot" icon="el-icon-refresh"
+              <el-dropdown-item command="showLog" icon="el-icon-view" v-hasPermi="['web:camera:remove']">查看日志
-                v-hasPermi="['web:camera:remove']">重启</el-dropdown-item>
+              </el-dropdown-item>
+              <el-dropdown-item command="reboot" icon="el-icon-refresh" v-hasPermi="['web:camera:remove']">重启
+              </el-dropdown-item>
+              <el-dropdown-item command="autocfg" icon="el-icon-refresh" v-hasPermi="['web:camera:remove']">自动重启配置
+              </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      v-show="total>0"
+      @pagination="getList" />
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
 
     <!-- 添加或修改摄像机对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -218,10 +183,71 @@
         <el-button type="primary" @click="ftpConfirm">确 定</el-button>
       </div>
     </el-dialog>
+    <!-- 自动重启配置对话框 -->
+    <el-dialog title="自动重启配置" :visible.sync="restartcfg.open">
+      <div class="container">
+        <!-- 表单 -->
+        <div class="restartcfgform">
+          <el-form>
+            <el-form-item label="启用">
+              <el-switch v-model="restartcfg.run"></el-switch>
+            </el-form-item>
+            <el-select v-model="restartcfg.form.uWeekDay" placeholder="选择星期">
+              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="parseInt(item.value)">
+              </el-option>
+            </el-select>
+            <el-time-select v-model="restartcfg.form.uHour" :picker-options="{
+              start: '00:00',
+              step: '01:00',
+              end: '23:00'
+            }" placeholder="选择时间">
+            </el-time-select>
+          </el-form>
+        </div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="restartcfg.open = false">取 消</el-button>
+        <el-button type="primary" @click="restartcfgConfirm">确 定</el-button>
+      </div>
+    </el-dialog>
+    <!-- 日志详情对话框 -->
+    <el-dialog title="日志查询" :visible.sync="logform.open">
+      <div class="container">
+        <!-- 表单 -->
+        <el-form :model="logform.queryForm" ref="queryForm" size="small" :inline="true" label-width="68px">
+
+          <el-date-picker v-model="timeStage" type="datetimerange" range-separator="至" start-placeholder="开始日期"
+            end-placeholder="结束日期" @change="chooseTimeRange" :picker-options="setDateRange">
+          </el-date-picker>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
+          </el-form-item>
+
+
+        </el-form>
+        <el-table :data="logInfoList" stripe style="width: 100%">
+
+          <el-table-column label="记录时间" align="center" prop="clogTime" />
+          <el-table-column label="用户名" align="center" prop="coperUserName" />
+          <el-table-column label="主类型" align="center" prop="cmainType" />
+          <el-table-column label="次类型" align="center" prop="csubType" />
+          <el-table-column label="远程IP" align="center" prop="cremoteIP" />
+          <el-table-column label="客户端类型" align="center" prop="cclientType" />
+
+
+        </el-table>
+
+
+
+      </div>
+
+
+    </el-dialog>
   </div>
 </template>
 
 <script>
+import { formatDate } from "../../../utils/common";
 export default {
   name: "Camera",
   data() {
@@ -275,9 +301,85 @@ export default {
           isEnable: '',
           devsn: ''
         },
-        run: false,
+
+
         width: '100px'
+      },
+      //自动重启设置
+      restartcfg: {
+        open: false,
+        form: {
+          id: '',
+          bEnable: '',
+          uHour: '',
+          uWeekDay: '',
+        },
+        run: false,
+      },
+      //日志
+      logform: {
+        open: false,
+        queryForm: {
+          id: '',
+          startTime: '',
+          endTime: ''
+        },
+
+        run: false,
+      },
+      logInfoList: [],
+      options: [{
+        value: '0',
+        label: '星期日'
+      }, {
+        value: '1',
+        label: '星期一'
+      }, {
+        value: '2',
+        label: '星期二'
+      }, {
+        value: '3',
+        label: '星期三'
+      }, {
+        value: '4',
+        label: '星期四'
+      }, {
+        value: '5',
+        label: '星期五'
+      }, {
+        value: '6',
+        label: '星期六'
+      }],
+      timeStage: [],
+      // 设置可选择的时间段，*** 必须在 data 返回数据 ***
+      setDateRange: {
+
+        // 设置不能选择的日期
+        onPick: ({
+          maxDate,
+          minDate
+        }) => {
+          if (minDate) { //如果默认有最小日期
+            this.choiceDate0 = minDate.getTime();
+          } else { //如果最小日期被清空，则最小日期为当天
+            this.choiceDate0 = new Date();
           }
+          if (maxDate) {
+            this.choiceDate0 = '';
+          }
+        },
+        disabledDate: (time) => {
+          let choiceDateTime = new Date(this.choiceDate0).getTime(); //选中的第一个日期
+          if (this.choiceDate0) {
+            //间隔15天，则加减14天---“这主要看需求”
+            //14天的时间戳：14*24*3600*1000=1209600000
+            return (time.getTime() > (choiceDateTime + 86400000)) || (time.getTime() < (choiceDateTime - 86400000));
+          }
+        },
+
+      },
+
+
     };
   },
   created() {
@@ -360,9 +462,15 @@ export default {
         case "showVideo":
           this.showVideo(row);
           break;
+        case "showLog":
+          this.showLog(row);
+          break;
         case "reboot":
           this.reboot(row);
           break;
+        case "autocfg":
+          this.autocfg(row);
+          break;
         default:
           break;
       }
@@ -415,6 +523,39 @@ export default {
         this.ftp.open = false;
       }
     },
+    //
+    async autocfg(row) {
+
+      this.restartcfg.form.id = row.id;
+
+      const status = row.status;
+      if (status != 1) {
+        this.$modal.msg("设备未在线");
+        return;
+      }
+      let res = await this.$axiosGet('/web/camera/getautocfg/' + this.restartcfg.form.id);
+
+      if (res.code === 0) {
+
+        this.restartcfg.form = res.data;
+        this.restartcfg.form.id = row.id;
+        this.restartcfg.run = this.restartcfg.form.bEnable == 1;
+        this.restartcfg.open = true;
+      }
+    },
+
+    //发送自动重启配置表单
+    async restartcfgConfirm() {
+
+      console.log(this.restartcfg.form)
+      this.restartcfg.form.bEnable = this.restartcfg.run ? 1 : 0;
+      this.restartcfg.form.uHour = this.restartcfg.form.uHour.substring(0, 2)
+      let res = await this.$axiosPost('/web/camera/setautocfg', this.restartcfg.form);
+      if (res.code === 0) {
+        this.$modal.msgSuccess("修改成功");
+        this.restartcfg.open = false;
+      }
+    },
     reboot(row) {
       const id = row.id;
       const status = row.status;
@@ -454,6 +595,34 @@ export default {
         this.$modal.msg(res.msg);
       }
     },
+    async showLog(row) {
+      this.logform.queryForm.id = row.id
+      const status = row.status;
+      if (status != 1) {
+        this.$modal.msg("设备未在线");
+        return;
+      }
+      this.logform.open = true;
+    },
+    chooseTimeRange() {
+
+      if (this.timeStage != null) {
+        this.logform.queryForm.startTime = formatDate(this.timeStage[0], 'yyyy-MM-dd hh:mm:ss');
+        this.logform.queryForm.endTime = formatDate(this.timeStage[1], 'yyyy-MM-dd hh:mm:ss');
+      }
+
+
+
+    },
+    async handleQuery() {
+      let res = await this.$axiosGet('/web/camera/getloginfo', this.logform.queryForm);
+
+      if (res.code === 0) {
+        this.logInfoList = res.data;
+
+        console.log(this.logInfoList)
+      }
+    },
     async register() {
       let res = await this.$axiosGet('/web/camera/register');
       if (res.code === 0) {
@@ -511,16 +680,20 @@ export default {
 .container {
   display: flex;
 }
+
 .ftpform {
   width: 300px;
   margin-right: 50px;
 }
+
 .ftpform .el-form {
   width: 100%;
 }
+
 .table {
   flex: 1;
 }
+
 .head {
   font-size: 24px;
   line-height: 36px;
@@ -533,18 +706,22 @@ export default {
     inset -2px -2px 2px hsla(200, 88%, 55%, .22),
     inset 0 0 1px hsla(200, 88%, 55%, .22);
 }
+
 .tips {
   margin: 10px 0;
 }
+
 .tips span {
   display: grid;
   grid: 1fr/1fr 10px;
 }
+
 .notice {
   color: #f33;
   padding-right: 20px;
   display: flex;
 }
+
 .notice div:first-child {
   width: 80px;
 }