1、开发算法场景模块

2、算法管理下添加创建时间、状态筛选

src/views/algorithm/base/index.vue

@@ -9,6 +9,32 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
+        <el-form-item label="创建时间">
+            <el-date-picker
+              v-model="dateRange"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="状态" prop="status">
+            <el-select
+              v-model="queryParams.status"
+              placeholder="状态"
+              clearable
+              style="width: 240px"
+            >
+              <el-option
+                v-for="dict in dict.type.sys_normal_disable"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -96,6 +122,7 @@
   
   export default {
     name: "Base",
+    dicts: ['sys_normal_disable'],
     data() {
       return {
         // 遮罩层
@@ -116,6 +143,8 @@
         title: "",
         // 是否显示弹出层
         open: false,
+        // 日期范围
+        dateRange: [],
         // 查询参数
         queryParams: {
           pageNum: 1,
@@ -139,7 +168,7 @@
       /** 查询算法列表 */
       getList() {
         this.loading = true;
-        listBase(this.queryParams).then(response => {
+        listBase(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
           this.baseList = response.rows;
           this.total = response.total;
           this.loading = false;
@@ -174,6 +203,7 @@
       },
       /** 重置按钮操作 */
       resetQuery() {
+        this.dateRange = [];
         this.resetForm("queryForm");
         this.handleQuery();
       },

src/views/algorithm/camera/index.vue

@@ -9,6 +9,32 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
+        <el-form-item label="创建时间">
+            <el-date-picker
+              v-model="dateRange"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="状态" prop="status">
+            <el-select
+              v-model="queryParams.status"
+              placeholder="状态"
+              clearable
+              style="width: 240px"
+            >
+              <el-option
+                v-for="dict in dict.type.sys_normal_disable"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -96,6 +122,7 @@
   
   export default {
     name: "Base",
+    dicts: ['sys_normal_disable'],
     data() {
       return {
         // 遮罩层
@@ -116,6 +143,8 @@
         title: "",
         // 是否显示弹出层
         open: false,
+        // 日期范围
+        dateRange: [],
         // 查询参数
         queryParams: {
           pageNum: 1,
@@ -139,7 +168,7 @@
       /** 查询算法摄像头列表 */
       getList() {
         this.loading = true;
-        listBase(this.queryParams).then(response => {
+        listBase(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
           this.baseList = response.rows;
           this.total = response.total;
           this.loading = false;
@@ -174,6 +203,7 @@
       },
       /** 重置按钮操作 */
       resetQuery() {
+        this.dateRange = [];
         this.resetForm("queryForm");
         this.handleQuery();
       },

src/views/algorithm/piece/index.vue

@@ -9,6 +9,32 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="创建时间">
+            <el-date-picker
+              v-model="dateRange"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="状态" prop="status">
+            <el-select
+              v-model="queryParams.status"
+              placeholder="状态"
+              clearable
+              style="width: 240px"
+            >
+              <el-option
+                v-for="dict in dict.type.sys_normal_disable"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -96,6 +122,7 @@ import { listBase, getBase, delBase, addBase, updateBase } from "@/api/algorithm
 
 export default {
   name: "Base",
+  dicts: ['sys_normal_disable'],
   data() {
     return {
       // 遮罩层
@@ -116,6 +143,8 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      // 日期范围
+      dateRange: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -138,7 +167,7 @@ export default {
     /** 查询策略算法块列表 */
     getList() {
       this.loading = true;
-      listBase(this.queryParams).then(response => {
+      listBase(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
         this.baseList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -172,6 +201,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.dateRange = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },

src/views/algorithm/scene/index.vue

@@ -17,30 +17,32 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="处理的预警类型" prop="alarmTypes">
-          <el-input
-            v-model="queryParams.alarmTypes"
-            placeholder="请输入处理的预警类型"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="每秒帧数" prop="frameSecond">
-          <el-input
-            v-model="queryParams.frameSecond"
-            placeholder="请输入每秒帧数"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="摄像头id列表" prop="cameraIdList">
-          <el-input
-            v-model="queryParams.cameraIdList"
-            placeholder="请输入摄像头id列表"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
+        <el-form-item label="创建时间">
+            <el-date-picker
+              v-model="dateRange"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="状态" prop="status">
+            <el-select
+              v-model="queryParams.status"
+              placeholder="状态"
+              clearable
+              style="width: 240px"
+            >
+              <el-option
+                v-for="dict in dict.type.sys_normal_disable"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -58,49 +60,26 @@
             v-hasPermi="['system:base:add']"
           >新增</el-button>
         </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="success"
-            plain
-            icon="el-icon-edit"
-            size="mini"
-            :disabled="single"
-            @click="handleUpdate"
-            v-hasPermi="['system:base:edit']"
-          >修改</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="danger"
-            plain
-            icon="el-icon-delete"
-            size="mini"
-            :disabled="multiple"
-            @click="handleDelete"
-            v-hasPermi="['system:base:remove']"
-          >删除</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            @click="handleExport"
-            v-hasPermi="['system:base:export']"
-          >导出</el-button>
-        </el-col>
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
   
       <el-table v-loading="loading" :data="baseList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="主键id" align="center" prop="id" />
-        <el-table-column label="场景名" align="center" prop="sceneName" />
-        <el-table-column label="算法id" align="center" prop="algorithmId" />
-        <el-table-column label="处理的预警类型" align="center" prop="alarmTypes" />
+        <el-table-column label="场景名称" align="center" prop="sceneName" />
+        <el-table-column label="分流预警类型" align="center" prop="alarmTypes" />
         <el-table-column label="每秒帧数" align="center" prop="frameSecond" />
-        <el-table-column label="摄像头id列表" align="center" prop="cameraIdList" />
+        <el-table-column label="场景摄像头" align="center" prop="cameras" />
+        <el-table-column label="算法" align="center" prop="algorithmName" />
+        <el-table-column label="创建人" align="center" prop="createBy" />
+        <el-table-column label="创建时间" align="center" prop="createTime" width="160">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+        <el-table-column label="排序" align="center" prop="sort" />
+        <el-table-column label="是否在线" align="center" prop="live" />
+        <el-table-column label="状态" align="center" prop="status" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
@@ -161,6 +140,7 @@
   
   export default {
     name: "Base",
+    dicts: ['sys_normal_disable'],
     data() {
       return {
         // 遮罩层
@@ -181,6 +161,8 @@
         title: "",
         // 是否显示弹出层
         open: false,
+        // 日期范围
+        dateRange: [],
         // 查询参数
         queryParams: {
           pageNum: 1,
@@ -205,7 +187,7 @@
       /** 查询算法场景列表 */
       getList() {
         this.loading = true;
-        listBase(this.queryParams).then(response => {
+        listBase(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
           this.baseList = response.rows;
           this.total = response.total;
           this.loading = false;
@@ -235,6 +217,7 @@
       },
       /** 重置按钮操作 */
       resetQuery() {
+        this.dateRange = [];
         this.resetForm("queryForm");
         this.handleQuery();
       },