Commit cff090da authored by 胡占生's avatar 胡占生 🇨🇳
Browse files

fix: 视频预览界面 实时预警修复，日志管理 修复查询问题

parent 53dd3b78

src/views/alarmControl/index.vue

+10 −10
Original line number Diff line number Diff line
@@ -17,6 +17,16 @@ 
                      />

                  </el-select>

                </el-form-item>

                <el-form-item label="算法列表" prop="applicationScenarios">

                  <el-select v-model="queryParams.applicationScenarios" placeholder="请选择算法列表" clearable style="width: 200px">

                            <el-option 

                            v-for="disc in algorithm_scen"

                            :key="disc.value"

                            :label="disc.label"

                             :value="disc.value"

                            />

                          </el-select>

                </el-form-item>

                <el-form-item label="创建时间" >

                  <el-date-picker

                    v-model="dateRange"
@@ -27,16 +37,6 @@ 
                    end-placeholder="结束日期"

                  ></el-date-picker>

                </el-form-item>

                <el-form-item label="算法场景" prop="applicationScenarios">

                  <el-select v-model="queryParams.applicationScenarios" placeholder="请选择算法场景" clearable style="width: 200px">

                            <el-option 

                            v-for="disc in algorithm_scen"

                            :key="disc.value"

                            :label="disc.label"

                             :value="disc.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>

src/views/logControl/index.vue

+16 −6
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ 
                     <el-date-picker v-model="dateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-"

                        start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>

                  </el-form-item>

                  <el-form-item label="摄像头" prop="deptName">

                     <el-select v-model="queryParams.deptName" placeholder="请选择摄像头" clearable style="width: 200px">

                        <el-option v-for="dict in sys_job_status" :key="dict.value" :label="dict.label" :value="dict.value" />

                  <el-form-item label="算法名称" prop="deptName">

                     <el-select v-model="queryParams.deptName" placeholder="请选择算法" clearable style="width: 200px">

                        <el-option v-for="dict in algList" :key="dict.algorithmEnglish" :label="dict.algorithmName" :value="dict.algorithmEnglish" />

                     </el-select>

                  </el-form-item>

                  <el-form-item>
@@ -251,6 +251,7 @@ import {listAlgLog,listCameraLog} from "@/api/logControl/index"; 
import { list as OpList } from "@/api/monitor/operlog";

import { list as LoList} from "@/api/monitor/logininfor";

import { get } from "@vueuse/core";

import { listAlg } from "@/api/algorithmList/index.js";

const router = useRouter();

const { proxy } = getCurrentInstance();

const { sys_job_group, sys_job_status,sys_oper_type, sys_common_status } = proxy.useDict(
@@ -262,6 +263,7 @@ const { sys_job_group, sys_job_status,sys_oper_type, sys_common_status } = proxy 
const nowText = ref("日志管理");

const activeName = ref("摄像头日志");

const AlgLogList = ref([]);

const algList = ref([]);

const CameraLogList = ref([]);

const OperateLogList = ref([]);

const logininforList = ref([]);
@@ -302,7 +304,8 @@ const { queryParams, form, rules } = toRefs(data); 


function handleClick(val) {

   activeName.value=val.props.name

   console.log("🚀 ~ handleClick ~ activeName.value:", activeName.value)

   dateRange.value = [];

   queryParams.value={}

   getAllList()

 }
@@ -313,6 +316,14 @@ function getAllList(){ 
  if(activeName.value=='登录日志') getLogininforList()

}



/** 查询算法列表 */

function getAlgList() {

   listAlg({pageNum: 1,pageSize: 100}).then(

      (response) => {

         algList.value = response.rows;

      }

   );

}

/** 查询算法日志列表 */

function getAlgLogList() {

   loading.value = true;
@@ -383,7 +394,6 @@ function reset() { 
      concurrent: 1,

      status: "0",

   };



   proxy.resetForm("jobRef");

}
@@ -518,7 +528,7 @@ function handleExport() { 
      `job_${new Date().getTime()}.xlsx`

   );

}



getAlgList()

getAllList();

</script>

<style scoped lang="scss">

src/views/videoControl/videoPreview/index.vue

+5 −7
Original line number Diff line number Diff line
@@ -188,14 +188,12 @@ function handleNodeClick(row) { 
  const treeID = row.id.split("-")[1];

  if(treeType=='点位'){

    handlvideoPath(treeID)

    queryParams.value.locationId = treeID;

    queryParams.value.regionId = null;

  }else{

    queryParams.value.regionId = treeID;

    queryParams.value.locationId = null;

  }

  clearTimeout(timeoutId);

  getWaringData()

  // else{

  //   queryParams.value.regionId = treeID;

  // }

  // clearTimeout(timeoutId);

  // getWaringData()

}

function handjudge(row) {

  const treeType = row.id.split("-")[0];