实时监控-右侧数据不准确修复;详情样式调整:任务名称颜色变更;预警声音提示暂时隐藏。
摄像机配置-隐藏复制粘贴功能;
6个文件已修改
34 ■■■■■ 已修改文件
src/Pool/VideoCapture.ts 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/Pool/VideoTaskData.ts 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/subComponents/CardItem.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/subComponents/ModelCard.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/cameraAccess/components/SeparateRules.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/cameraVideo/components/VideoPhoto.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/Pool/VideoCapture.ts
@@ -41,12 +41,12 @@
  public async monitorCapture() {
    const rsp: any = await monitorRealTimeCaptureData({
      // treeNodes: this.cameras
      treeNodes: this.cameras
    });
    if (rsp && rsp.success) {
      if (rsp.data.datalist && rsp.data.datalist.length > 0) {
        rsp.data.datalist.reverse().forEach(element => {
      if (rsp.data.list.datalist && rsp.data.list.datalist.length > 0) {
        rsp.data.list.datalist.reverse().forEach(element => {
          let rt = this.cards.filter((c: any) => {
            return c.activeObject.id === element.activeObject.id
          })
@@ -70,6 +70,7 @@
          this.firstCardId = this.cards[0]["activeObject"].id
          console.log(this.firstCardId )
        }
        // console.info("card:"+JSON.stringify(this.cards[0]))
      }
    }
src/Pool/VideoTaskData.ts
@@ -86,10 +86,11 @@
    // });
    const rsp: any = await initTaskDataTwo({
      warning:1,
      tasks: [this.tasks[this.activeIndex].id],
      taskIds: [this.tasks[this.activeIndex].id],
      treeNodes: this.cameras
    });
    this.taskCard = []//初始化所有预警数据
    // console.log(rsp, 'rsp数据')
    if (rsp && rsp.success && rsp.data.list.datalist) {
      rsp.data.list.datalist.forEach(element => {
@@ -110,7 +111,7 @@
    const rsp: any = await monitorRealTimeTaskData({
      warning:1,
      tasks: [this.tasks[this.activeIndex].id],
      taskIds: [this.tasks[this.activeIndex].id],
      // tasks: this.tasks[this.activeIndex].id.split(','),
      treeNodes: this.cameras
    });
src/components/subComponents/CardItem.vue
@@ -339,9 +339,15 @@
          <span class="fontStyle color222">{{ data.cameraAddr }}</span>
        </p>
        <p v-for="(item, index) in data.event_levels" :key="index + 'rule'">
              <span>{{ data.task_name }}</span
              <span v-if="data.is_warning === 1" style="color: red;">{{ data.task_name }}</span
              >
              <span v-else>{{ data.task_name }}</span
              >&nbsp;&nbsp;
              <span v-if="item.dictValue !== '撤防'">{{
              <span v-if="data.is_warning === 1" style="color: red;">{{
                item.dictValue
              }}</span
              >
              <span v-else>{{
                item.dictValue
              }}</span
              >&nbsp;
src/components/subComponents/ModelCard.vue
@@ -51,8 +51,10 @@
              </p>
              <p>
                <span class="fontStyleForModel">督查任务</span>
                <span style="margin-left:20px;">{{ data.task_name }}</span>
                <span style="margin-left:20px;color: red;">{{ data.event_level_name }}</span>
                <span v-if="data.is_warning === 1" style="margin-left:20px;color: red;">{{ data.task_name }}</span>
                <span v-else style="margin-left:20px;">{{ data.task_name }}</span>
                <span v-if="data.is_warning === 1" style="margin-left:20px;color: red;">{{ data.event_level_name }}</span>
                <span v-else style="margin-left:20px;">{{ data.event_level_name }}</span>
              </p>
              <p v-if="data.is_warning === 1">
                <span class="fontStyleForModel">隐患描述</span>
src/pages/cameraAccess/components/SeparateRules.vue
@@ -40,7 +40,7 @@
            <span class="label">SmartAI节点: {{ Camera.runServerName }}</span>
          </div>
          <div v-if="Camera.analytics" class="flex-box">
          <!-- <div v-if="Camera.analytics" class="flex-box">
            <span class="label">算法快速通道</span>
            <div class="channel flex-box">
              <el-tooltip effect="dark" content="复制此摄像机算法规则" placement="bottom" popper-class="atooltip">
@@ -55,7 +55,7 @@
                  " @click="ctrlV" class="iconfont iconniantie ml5"></span>
              </el-tooltip>
            </div>
          </div>
          </div> -->
        </div>
      </div>
    </div>
src/pages/cameraVideo/components/VideoPhoto.vue
@@ -2,7 +2,7 @@
  <div style="height: 100%;" class="swiper-box">
    <div class="swiper-box-top">
      <h2 style="float:left; font-size:15px">实时抓拍</h2>
      <audio ref="alarmAudio" src="/libs/14184.wav" style="display:none"></audio>
      <!-- <audio ref="alarmAudio" src="/libs/14184.wav" style="display:none"></audio> 预警声音 -->
      <span
        style="float:left;font-family:PingFangSC-Regular;font-size:13px;color:#999999;"
      >&nbsp;&nbsp; (共{{VideoCaptrue.cards.length}}张)</span>