Merge remote-tracking branch 'origin/master'

rtsp-vue/src/api/video/insRecord.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询巡检任务记录列表
+export function listInspectionRecord(query) {
+  return request({
+    url: '/video/inspectionRecord/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询巡检任务记录详细
+export function getInspectionRecord(recordId) {
+  return request({
+    url: '/video/inspectionRecord/' + recordId,
+    method: 'get'
+  })
+}
+
+// 新增巡检任务记录
+export function addInspectionRecord(data) {
+  return request({
+    url: '/video/inspectionRecord',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改巡检任务记录
+export function updateInspectionRecord(data) {
+  return request({
+    url: '/video/inspectionRecord',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除巡检任务记录
+export function delInspectionRecord(recordId) {
+  return request({
+    url: '/video/inspectionRecord/' + recordId,
+    method: 'delete'
+  })
+}

rtsp-vue/src/views/monitor/job/index.vue

@@ -308,7 +308,7 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     jobName: undefined,
     jobGroup: undefined,
     status: undefined

rtsp-vue/src/views/monitor/job/log.vue

@@ -191,7 +191,7 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     dictName: undefined,
     dictType: undefined,
     status: undefined

rtsp-vue/src/views/monitor/logininfor/index.vue

@@ -144,7 +144,7 @@ const defaultSort = ref({ prop: "loginTime", order: "descending" });
 // 查询参数
 const queryParams = ref({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   ipaddr: undefined,
   userName: undefined,
   status: undefined,

rtsp-vue/src/views/monitor/operlog/index.vue

@@ -219,7 +219,7 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     operIp: undefined,
     title: undefined,
     operName: undefined,

rtsp-vue/src/views/system/config/index.vue

@@ -185,7 +185,7 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     configName: undefined,
     configKey: undefined,
     configType: undefined

rtsp-vue/src/views/system/dict/data.vue

@@ -209,7 +209,7 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     dictType: undefined,
     dictLabel: undefined,
     status: undefined

rtsp-vue/src/views/system/dict/index.vue

@@ -193,7 +193,7 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     dictName: undefined,
     dictType: undefined,
     status: undefined

rtsp-vue/src/views/system/notice/index.vue

@@ -178,7 +178,7 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     noticeTitle: undefined,
     createBy: undefined,
     status: undefined

rtsp-vue/src/views/system/post/index.vue

@@ -164,7 +164,7 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     postCode: undefined,
     postName: undefined,
     status: undefined

rtsp-vue/src/views/system/role/authUser.vue

@@ -108,7 +108,7 @@ const userIds = ref([]);
 
 const queryParams = reactive({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   roleId: route.params.roleId,
   userName: undefined,
   phonenumber: undefined,

rtsp-vue/src/views/system/role/index.vue

@@ -282,7 +282,7 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     roleName: undefined,
     roleKey: undefined,
     status: undefined

rtsp-vue/src/views/system/role/selectUser.vue

@@ -79,7 +79,7 @@ const userIds = ref([]);
 
 const queryParams = reactive({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   roleId: undefined,
   userName: undefined,
   phonenumber: undefined

rtsp-vue/src/views/system/user/index.vue

@@ -330,7 +330,7 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     userName: undefined,
     phonenumber: undefined,
     status: undefined,

rtsp-vue/src/views/tool/gen/importTable.vue

@@ -61,7 +61,7 @@ const { proxy } = getCurrentInstance();
 
 const queryParams = reactive({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   tableName: undefined,
   tableComment: undefined
 });

rtsp-vue/src/views/tool/gen/index.vue

@@ -183,7 +183,7 @@ const uniqueId = ref("");
 const data = reactive({
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     tableName: undefined,
     tableComment: undefined
   },

rtsp-vue/src/views/video/alarm/index.vue

@@ -271,7 +271,7 @@ const viewForm = ref({});
 const data = reactive({
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     taskName: null,
     deviceName: null,
     alarmType: null,

rtsp-vue/src/views/video/device/index.vue

@@ -172,7 +172,7 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     type: null,
   },
   rules: {

rtsp-vue/src/views/video/image/index.vue

@@ -126,7 +126,7 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     imageName: null,
     imageData: null,
   },

rtsp-vue/src/views/video/inspection/index.vue

@@ -189,7 +189,7 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     taskName: null,
     deviceName: null,
     status: null

rtsp-vue/src/views/video/inspection/record.vue

@@ -0,0 +1,313 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="巡检任务" prop="taskId">
+        <el-select v-model="queryParams.taskId" placeholder="请选择巡检任务" clearable>
+          <el-option
+            v-for="item in inspectionList"
+            :key="item.taskId"
+            :label="item.taskName"
+            :value="item.taskId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="执行状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择执行状态" clearable>
+          <el-option
+            v-for="dict in ins_record_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAdd"
+          v-hasPermi="['video:inspectionRecord:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['video:inspectionRecord:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['video:inspectionRecord:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['video:inspectionRecord:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="inspectionRecordList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="巡检任务" align="center" prop="taskId" />
+      <el-table-column label="执行时间" align="center" prop="executeTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.executeTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="执行时长" align="center" prop="duration" />
+      <el-table-column label="巡检结果" align="center" prop="result" />
+      <el-table-column label="执行状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :options="ins_record_status" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['video:inspectionRecord:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['video:inspectionRecord:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改巡检任务记录对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="inspectionRecordRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="巡检任务" prop="taskId">
+          <el-select v-model="form.taskId" placeholder="请选择巡检任务">
+            <el-option
+              v-for="item in inspectionList"
+              :key="item.taskId"
+              :label="item.taskName"
+              :value="item.taskId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="执行时间" prop="executeTime">
+          <el-date-picker clearable
+            v-model="form.executeTime"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="请选择执行时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="执行时长" prop="duration">
+          <el-input v-model="form.duration" placeholder="请输入执行时长" />
+        </el-form-item>
+        <el-form-item label="附件" prop="accessory">
+          <file-upload v-model="form.accessory" />
+        </el-form-item>
+        <el-form-item label="巡检结果" prop="result">
+          <el-input v-model="form.result" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="执行状态" prop="status">
+          <el-select v-model="form.status" placeholder="请选择执行状态">
+            <el-option
+              v-for="dict in ins_record_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="InspectionRecord">
+import { listInspectionRecord, getInspectionRecord, delInspectionRecord, addInspectionRecord, updateInspectionRecord } from "@/api/video/insRecord";
+import { listInspection } from "@/api/video/inspection";
+
+const { proxy } = getCurrentInstance();
+const { ins_record_status } = proxy.useDict('ins_record_status');
+
+const inspectionList = ref([]);
+const inspectionRecordList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 20,
+    taskId: null,
+    executeTime: null,
+    duration: null,
+    accessory: null,
+    result: null,
+    status: null,
+  },
+  rules: {
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询巡检任务记录列表 */
+function getList() {
+  loading.value = true;
+  listInspectionRecord(queryParams.value).then(response => {
+    inspectionRecordList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false;
+  reset();
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    recordId: null,
+    taskId: null,
+    executeTime: null,
+    duration: null,
+    accessory: null,
+    result: null,
+    status: null,
+    createBy: null,
+    updateBy: null,
+    createTime: null,
+    updateTime: null,
+    delFlag: null,
+    remark: null
+  };
+  proxy.resetForm("inspectionRecordRef");
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+function getInspectionList() {
+  listInspection({ pageNum: 1, pageSize: 1000 }).then(response => {
+    inspectionList.value = response.rows;
+  });
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.recordId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "添加巡检任务记录";
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  const _recordId = row.recordId || ids.value
+  getInspectionRecord(_recordId).then(response => {
+    form.value = response.data;
+    open.value = true;
+    title.value = "修改巡检任务记录";
+  });
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["inspectionRecordRef"].validate(valid => {
+    if (valid) {
+      if (form.value.recordId != null) {
+        updateInspectionRecord(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+      } else {
+        addInspectionRecord(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _recordIds = row.recordId || ids.value;
+  proxy.$modal.confirm('是否确认删除巡检任务记录编号为"' + _recordIds + '"的数据项？').then(function() {
+    return delInspectionRecord(_recordIds);
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => {});
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('video/inspectionRecord/export', {
+    ...queryParams.value
+  }, `inspectionRecord_${new Date().getTime()}.xlsx`)
+}
+
+getInspectionList();
+getList();
+</script>

rtsp-vue/src/views/video/model/index.vue

@@ -162,7 +162,7 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     modelName: null,
     framework: null,
   },

rtsp-vue/vite.config.js

@@ -25,7 +25,7 @@ export default defineConfig(({ mode, command }) => {
     },
     // vite 相关配置
     server: {
-      port: 1024,
+      port: 80,
       host: true,
       open: true,
       proxy: {

ruoyi-generator/src/main/resources/vm/vue/index.vue.vm

@@ -398,7 +398,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 20,
 #foreach ($column in $columns)
 #if($column.query)
         $column.javaField: null#if($foreach.count != $columns.size()),#end

ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm

@@ -377,7 +377,7 @@ const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     #foreach ($column in $columns)
 #if($column.query)
     $column.javaField: null#if($foreach.count != $columns.size()),#end