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

fix: 菜单排序修改,点位管理回显修复,增加操作提示信息,增加视频流的拉流状态显示

parent ae074865
Loading
Loading
Loading
Loading
+0 −1
Original line number Original line Diff line number Diff line
@@ -9,7 +9,6 @@
      class="margin-top"
      class="margin-top"
      title=""
      title=""
      :column="1"
      :column="1"
      :size="size"
      border
      border
    >
    >
      <el-descriptions-item>
      <el-descriptions-item>
+2 −2
Original line number Original line Diff line number Diff line
@@ -75,8 +75,8 @@
                <el-col :span="division"  v-for="item in algList" :key="item.name">
                <el-col :span="division"  v-for="item in algList" :key="item.name">
                  <el-card  class="alg-item" shadow="hover" >
                  <el-card  class="alg-item" shadow="hover" >
                    <template v-slot:default >
                    <template v-slot:default >
                      <div style="width: 100%;overflow: hidden;">
                      <div style="display: grid; width: 100%; aspect-ratio: 16 / 9;overflow: hidden;">
                        <ImagePreview style="display: grid; width: 100%; aspect-ratio: 16 / 9;overflow: hidden;" :src="item.alarmImg"/>
                        <ImagePreview  :src="item.alarmImg"/>
                      </div>
                      </div>
                      <h2 :style="{color:item.alarmLevelColor}">{{ item.alarmType }}</h2>
                      <h2 :style="{color:item.alarmLevelColor}">{{ item.alarmType }}</h2>
                      <p style="color: #999999;font-size: 12px;">
                      <p style="color: #999999;font-size: 12px;">
+1 −4
Original line number Original line Diff line number Diff line
@@ -114,7 +114,6 @@
                      </video>
                      </video>
                    </div>
                    </div>
                  </div>
                  </div>
          
                  <!-- 进度条模块 -->
                  <!-- 进度条模块 -->
                  <div v-else style="text-align: center;">
                  <div v-else style="text-align: center;">
                    <el-progress :percentage="progressValue" />
                    <el-progress :percentage="progressValue" />
@@ -150,7 +149,6 @@
                  </div>
                  </div>
                </el-card>
                </el-card>
                <el-card style="position: relative;padding: 20px;">
                <el-card style="position: relative;padding: 20px;">
              
                  <div class="img-box" v-if="invalidList.length==0">
                  <div class="img-box" v-if="invalidList.length==0">
                    <img src="@/assets/images/default/Image-1.png" width="100%"/>
                    <img src="@/assets/images/default/Image-1.png" width="100%"/>
                  </div>
                  </div>
@@ -167,7 +165,6 @@
                      </div>
                      </div>
                    <img class="top-tip" src="@/assets/images/close.png" alt="">
                    <img class="top-tip" src="@/assets/images/close.png" alt="">
                  </div>
                  </div>
             
                </el-card>
                </el-card>
          </div>
          </div>
        </el-card>
        </el-card>
+12 −5
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@
    <div class="app-container home">
    <div class="app-container home">
      <TabTitle :text="nowText" />
      <TabTitle :text="nowText" />
     
     
      <div class="add-but">
      <div class="add-but">s
        <div class="search-input">
        <div class="search-input">
          <el-input
          <el-input
            v-model="queryParams.algorithmName"
            v-model="queryParams.algorithmName"
@@ -11,12 +11,13 @@
            class="input-with-select"
            class="input-with-select"
            clearable
            clearable
          >
          >
            <template #append>
            <!-- <template #append>
              <div @click="searchList" class="cursor: pointer;">
              <div class="my-search" style="cursor: pointer;">
                <el-button :icon="Search" />&nbsp; 搜索
                <el-button type="primary"  plain>搜索</el-button>
              </div>
              </div>
            </template>
            </template> -->
          </el-input>
          </el-input>
          <el-button type="primary"  @click="searchList"    plain>搜索</el-button>
        </div>
        </div>
          <!-- <el-button type="primary" plain @click="handAdd">新增算法</el-button> -->
          <!-- <el-button type="primary" plain @click="handAdd">新增算法</el-button> -->
          <el-button type="primary" @click="handeAdd" plain>告警等级</el-button>
          <el-button type="primary" @click="handeAdd" plain>告警等级</el-button>
@@ -300,6 +301,12 @@ import { el } from "element-plus/es/locales.mjs";
  </script>
  </script>
  
  
  <style scoped lang="scss">
  <style scoped lang="scss">
    .my-search:active{
        color: #409EFF;
    }
    .my-search:focus-within {
        color: #409EFF;
    }
    .el-menu-item.is-active{
    .el-menu-item.is-active{
      background: #E4F2FF !important;
      background: #E4F2FF !important;
    }
    }
+3 −1
Original line number Original line Diff line number Diff line
@@ -413,7 +413,9 @@ function handleDeviceChange(e, index) {
  getVideos();
  getVideos();
}
}
onMounted(() => {
onMounted(() => {
  setTimeout(()=>{
    getVideos();
    getVideos();
  },100)
  aiAlgorithm.search.value.algorithmStatus = 0;
  aiAlgorithm.search.value.algorithmStatus = 0;
  aiAlgorithm.getList();
  aiAlgorithm.getList();
});
});
Loading