实现视频标签，修复bug

src/api/videoMonitor/index.ts

@@ -64,3 +64,28 @@ export function addVideoTag(data) {
     data: data
   });
 }
+
+// 视频点位标签信息-添加
+export function addVideoTagLabel(data) {
+  return request({
+    url: '/api/videoResource/videoinfo/add_video_tag_label',
+    method: 'post',
+    data: data
+  });
+}
+
+export function getRecentlyVideoTagInfo() {
+  return request({
+    url: '/api/videoResource/videoinfo/get_recently_video_tag_info',
+    method: 'get'
+  });
+}
+
+// 视频点位标签信息-类型、行业下钻接口
+export function getLxHyVideoTagInfo(params) {
+  return request({
+    url: '/api/videoResource/videoinfo/get_lx_hy_video_tag_info',
+    method: 'get',
+    params: params
+  });
+}

src/components/Dialog/index.vue

@@ -25,11 +25,13 @@
     <i class="triangle2" />
     <i class="triangle3" />
     <i class="triangle4" />
-    <VideoTagEdit v-model="showAddTag" :id="getTagId" />
+    <VideoTagEdit v-model="showAddTag" :tags="tags" :id="getTagId" @updateVideoTag="getData" />
   </div>
 </template>
 
 <script lang="ts" setup name="Dialog">
+import { getVideoTagInfo } from '@/api/videoMonitor';
+
 interface Tag {
   name: string;
 }
@@ -91,6 +93,7 @@ const computedHeight = computed(() => {
     return '760px';
   }
 });
+let tags = ref([]);
 // 关闭弹窗
 const closeDialog = () => {
   emit('close');
@@ -110,6 +113,14 @@ let showAddTag = ref(false);
 const handleShowAddTag = () => {
   showAddTag.value = true;
 };
+const getData = () => {
+  getVideoTagInfo({ video_code: props.getTagId }).then((res) => {
+    tags.value = res.data;
+  });
+};
+onMounted(() => {
+  getData();
+});
 </script>
 
 <style lang="scss" scoped>

src/components/VideoTagEdit/index.vue

@@ -9,7 +9,7 @@
         <div class="title">当前标签</div>
       </div>
       <div class="tags">
-        <div v-for="(item, index) in currentTags" :key="index" class="tag">{{ item.dict_label }}</div>
+        <div v-for="(item, index) in tags" :key="index" class="tag">{{ item.dict_label }}</div>
       </div>
       <div class="title-box">
         <div class="title">新建标签</div>
@@ -22,7 +22,7 @@
         <div class="title">最近标签</div>
       </div>
       <div class="tags">
-        <div v-for="(item, index) in recentTags" :key="index" class="tag">{{ item.name }}</div>
+        <div v-for="(item, index) in recentTags" :key="index" class="tag" @click="handleAdd2(item)">{{ item.dict_label }}</div>
       </div>
       <div class="title-box3">
         <i class="icon-type" />
@@ -32,13 +32,14 @@
           :teleported="false"
           class="custom-select"
           popper-class="custom-select-popper"
-          style="width: 140px; margin-bottom: 10px;"
+          style="width: 140px; margin-bottom: 10px"
         >
-          <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value" />
+          <el-option label="全部" value="lx" />
+          <el-option v-for="item in video_tag_type" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </div>
       <div class="tags">
-        <div v-for="(item, index) in typeTags" :key="index" class="tag">{{ item.name }}</div>
+        <div v-for="(item, index) in typeTags" :key="index" class="tag" @click="handleAdd2(item)">{{ item.dict_label }}</div>
       </div>
       <div class="title-box3">
         <i class="icon-industry" />
@@ -48,58 +49,63 @@
           :teleported="false"
           class="custom-select"
           popper-class="custom-select-popper"
-          style="width: 140px; margin-bottom: 10px;"
+          style="width: 140px; margin-bottom: 10px"
         >
-          <el-option v-for="item in industryOptions" :key="item.value" :label="item.label" :value="item.value" />
+          <el-option label="全部" value="hy" />
+          <el-option v-for="item in video_tag_industry" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </div>
       <div class="tags">
-        <div v-for="(item, index) in industryTags" :key="index" class="tag">{{ item.name }}</div>
+        <div v-for="(item, index) in industryTags" :key="index" class="tag" @click="handleAdd2(item)">{{ item.dict_label }}</div>
       </div>
     </div>
   </div>
 </template>
 
 <script lang="ts" setup name="VideoTagEdit">
+import {
+  addVideoTag,
+  addVideoTagLabel,
+  getLxHyVideoTagInfo,
+  getRecentlyVideoTagInfo,
+  getVideoTagInfo
+} from '@/api/videoMonitor';
+
 const props = defineProps({
   modelValue: Boolean,
+  tags: [],
   id: String
 });
-const emits = defineEmits(['update:modelValue']);
-let currentTags = ref([]);
+const emits = defineEmits(['update:modelValue', 'updateVideoTag']);
+const proxy = getCurrentInstance()?.proxy;
+const { video_tag_type, video_tag_industry } = toRefs<any>(proxy?.useDict('video_tag_type', 'video_tag_industry'));
 let addTag = ref('');
 let recentTags = ref([]);
-let type = ref('');
+let type = ref('lx');
 let typeTags = ref([]);
-let typeOptions = ref([]);
-let industry = ref('');
+let industry = ref('hy');
 let industryTags = ref([]);
-let industryOptions = ref([]);
 
-const getData = () => {
-  getVideoTagInfo({ video_code: props.id }).then((res) => {
-    currentTags.value = res.data;
+const getTypeList = () => {
+  getLxHyVideoTagInfo({ dict_value: type.value }).then((res) => {
+    typeTags.value = res.data;
+  });
+};
+const getIndustryList = () => {
+  getLxHyVideoTagInfo({ dict_value: industry.value }).then((res) => {
+    industryTags.value = res.data;
   });
 };
-
 watch(
   () => props.id,
   () => {
     if (!!props.id) {
-      getData();
-      recentTags.value = [{ name: '河坝' }, { name: '水库' }, { name: '山塘' }];
-      typeTags.value = [{ name: '河坝' }, { name: '水库' }, { name: '山塘' }];
-      industryTags.value = [{ name: '河坝' }, { name: '水库' }, { name: '山塘' }];
-      typeOptions.value = [
-        { label: '全部', value: '' },
-        { label: '水库', value: '1' }
-      ];
-      industryOptions.value = [
-        { label: '全部', value: '' },
-        { label: '水库', value: '1' }
-      ];
+      getRecentlyVideoTagInfo().then((res) => {
+        recentTags.value = res.data;
+      });
+      getTypeList();
+      getIndustryList();
     } else {
-      currentTags.value = [];
       addTag.value = '';
       recentTags.value = [];
       typeTags.value = [];
@@ -115,15 +121,20 @@ const handleClose = () => {
   emits('update:modelValue', false);
 };
 const handleAdd = () => {
-  addVideoTag({
+  addVideoTagLabel({
     video_code: props.id,
-    dict_value: addTag.value,
+    dict_label: addTag.value,
     dict_type: 'video_type'
   }).then(() => {
-    getData();
+    emits('updateVideoTag');
   });
   addTag.value = '';
 };
+const handleAdd2 = (item) => {
+  addVideoTag({ video_code: props.id, dict_value: item.dict_value, dict_type: 'video_type' }).then(() => {
+    emits('updateVideoTag');
+  });
+};
 </script>
 
 <style lang="scss" scoped>
@@ -245,6 +256,7 @@ const handleAdd = () => {
         justify-content: center;
         margin-top: 10px;
         padding: 0 20px 0 15px;
+        cursor: pointer;
       }
       .custom-input {
         width: 230px;

src/types/components.d.ts

@@ -22,14 +22,23 @@ declare module 'vue' {
     DistributionMap: typeof import('./../components/Map/YztMap/DistributionMap.vue')['default']
     DrawMap: typeof import('./../components/Map/YztMap/DrawMap.vue')['default']
     Editor: typeof import('./../components/Editor/index.vue')['default']
+    ElAnchor: typeof import('element-plus/es')['ElAnchor']
+    ElAnchorLink: typeof import('element-plus/es')['ElAnchorLink']
     ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete']
     ElBadge: typeof import('element-plus/es')['ElBadge']
     ElButton: typeof import('element-plus/es')['ElButton']
+    ElCard: typeof import('element-plus/es')['ElCard']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
+    ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
+    ElCollapse: typeof import('element-plus/es')['ElCollapse']
+    ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
+    ElContainer: typeof import('element-plus/es')['ElContainer']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
+    ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
+    ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
     ElDrawer: typeof import('element-plus/es')['ElDrawer']
@@ -39,27 +48,37 @@ declare module 'vue' {
     ElEmpty: typeof import('element-plus/es')['ElEmpty']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
+    ElHeader: typeof import('element-plus/es')['ElHeader']
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
+    ElLink: typeof import('element-plus/es')['ElLink']
+    ElMain: typeof import('element-plus/es')['ElMain']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
     ElRadio: typeof import('element-plus/es')['ElRadio']
+    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
+    ElSegmented: typeof import('element-plus/es')['ElSegmented']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
     ElSkeletonItem: typeof import('element-plus/es')['ElSkeletonItem']
     ElSlider: typeof import('element-plus/es')['ElSlider']
+    ElSpace: typeof import('element-plus/es')['ElSpace']
+    ElStep: typeof import('element-plus/es')['ElStep']
+    ElSteps: typeof import('element-plus/es')['ElSteps']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
+    ElTabPane: typeof import('element-plus/es')['ElTabPane']
+    ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElText: typeof import('element-plus/es')['ElText']
     ElTimeline: typeof import('element-plus/es')['ElTimeline']
@@ -80,6 +99,7 @@ declare module 'vue' {
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
     IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
     IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
+    IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default']
     IFrame: typeof import('./../components/iFrame/index.vue')['default']
     ImagePreview: typeof import('./../components/ImagePreview/index.vue')['default']
     ImageUpload: typeof import('./../components/ImageUpload/index.vue')['default']

src/views/emergencyCommandMap/RightSection/knowledgeWarehouse.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog custom-show type="xl" title="知识库列表" @close="closeDialog">
+  <Dialog custom-show type="xl" title="知识库列表" height="560px" hide-footer @close="closeDialog">
     <!-- 表格组件 -->
     <div class="common-table">
       <div class="table-header">
@@ -12,73 +12,105 @@
         <div class="td">发布时间</div>
       </div>
       <div v-for="(item, index) in tableData" :key="index" class="tr">
-        <div class="td">{{ item.report_id }}</div>
-        <div class="td">{{ item.report_name }}</div>
-        <div class="td">{{ item.source_unit }}</div>
-        <div class="td">{{ item.keyword }}</div>
-        <div class="td">{{ item.event_type }}</div>
-        <div class="td">{{ item.abstract }}</div>
-        <div class="td">{{ item.release_time }}</div>
+        <div class="td">{{ item.reportId }}</div>
+        <div class="td">{{ item.reportName }}</div>
+        <div class="td">{{ item.subject }}</div>
+        <div class="td">{{ item.eventType }}</div>
+        <div class="td">{{ item.summary }}</div>
+        <div class="td">{{ item.publishingUnit }}</div>
+        <div class="td">{{ item.publishDate }}</div>
       </div>
     </div>
-    <!--    <div class="footer">-->
-    <!--      <pagination-->
-    <!--        v-show="total > 0"-->
-    <!--        v-model:page="queryParams.page"-->
-    <!--        v-model:limit="queryParams.page_size"-->
-    <!--        :total="total"-->
-    <!--        layout="total, prev, pager, next"-->
-    <!--        @pagination="getList"-->
-    <!--      />-->
-    <!--    </div>-->
-    <!--    <CloseEventDialog-->
-    <!--      v-model="closeDialogState.show"-->
-    <!--      :data="closeDialogState.form"-->
-    <!--      :event-id="eventId"-->
-    <!--      @update:model-value="handleCloseEventDialog"-->
-    <!--    />-->
+    <div class="footer">
+      <el-pagination
+        background
+        :hide-on-single-page="true"
+        :total="total"
+        :page-size="queryParams.pageSize"
+        :current-page="queryParams.pageNum"
+        @current-change="handleChangePage"
+      />
+    </div>
   </Dialog>
 </template>
 <script setup lang="ts">
-import CloseEventDialog from '@/views/routineCommandMap/eventing/CloseEventDialog.vue';
 import { reactive } from 'vue';
+import { fetchReports } from '@/api/knowledge/index';
 
 const emit = defineEmits(['update:show']);
 const closeDialog = () => {
   emit('update:show', false);
 };
 const queryParams = reactive({
-  page: 1,
-  page_size: 10
+  pageNum: 1,
+  pageSize: 10,
+  sortBy: 'publishDate',
+  sortOrder: 'desc'
 });
+let total = ref(0);
+const tableData = ref([]);
 
-const tableData = [
-  {
-    report_id: '001',
-    report_name: '测试报告1',
-    source_unit: '市应急局',
-    keyword: '干旱',
-    event_type: ' drought',
-    abstract: '干旱事件',
-    release_time: '2023-05-01'
-  },
-  {
-    report_id: '002',
-    report_name: '测试报告2',
-    source_unit: '市应急局',
-    keyword: ' flood',
-    event_type: 'flood',
-    abstract: '水灾事件',
-    release_time: '2023-05-02'
-  },
-  {
-    report_id: '003',
-    report_name: '测试报告3',
-    source_unit: '市应急局',
-    keyword: ' wildfire',
-    event_type: 'wildfire',
-    abstract: ' bushfire事件',
-    release_time: '2023-05-03'
-  }
-];
+const handleChangePage = (newNum) => {
+  queryParams.pageNum = newNum;
+  getList();
+};
+
+// getLists是获取列表数据的方法
+const getList = async () => {
+  fetchReports(queryParams).then((res) => {
+    total.value = res.total;
+    tableData.value = res.data;
+  });
+};
+
+onMounted(() => {
+  getList();
+});
 </script>
+
+<style lang="scss" scoped>
+.footer {
+  display: flex;
+  justify-content: flex-end;
+  margin: 15px 0;
+  .pagination-container {
+    margin: 0;
+  }
+  :deep(.el-pagination__total) {
+    color: #a7ccdf;
+  }
+  :deep(.el-pagination) {
+    .btn-next,
+    .btn-prev {
+      background-color: transparent;
+      border: none;
+      .el-icon {
+        color: #a7ccdf;
+      }
+    }
+    .btn-prev:disabled,
+    .btn-next:disabled {
+      background-color: transparent;
+      border: none;
+    }
+    .el-pager li {
+      text-align: center;
+      color: #a7ccdf;
+      background-color: #0e3064;
+      border: 1px solid #0c57a7;
+      margin: 0 6px;
+      &:hover {
+        background-color: #038dff;
+        border: 1px solid #038dff;
+      }
+    }
+    .el-pager li.is-active {
+      background-color: #038dff;
+      border: 1px solid #038dff;
+    }
+    .el-pagination__goto {
+      color: #a7ccdf;
+    }
+  }
+}
+</style>

src/views/globalMap/LeftMenu.vue

@@ -61,7 +61,7 @@
               >
                 <div class="text1" :title="item.name" @click="handleShowDialog(item)">{{ item.name }}</div>
                 <div class="tags">
-                  <div v-for="(item2, index2) in item.tag_info" :key="index2" class="tag">{{ item2.name }}</div>
+                  <div v-for="(item2, index2) in item.tag_info" :key="index2" class="tag">{{ item2.dict_label }}</div>
                 </div>
               </div>
               <div v-show="searchState.showList && searchState.videoList.length === 0" style="text-align: center">无数据</div>
@@ -119,7 +119,6 @@
     <Dialog
       v-if="showDialog"
       v-model="showDialog"
-      v-model:tags="videoMonitorData.tags"
       type="lg"
       header-type="header2"
       title="视频"

src/views/knowledge/knowledge-management/detail.vue

@@ -45,7 +45,7 @@
 import { ref, onMounted, defineProps, defineEmits } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { ElMessageBox, ElMessage } from 'element-plus';
-import { fetchReportDetail } from '@/api/kenowledge/index';
+import { fetchReportDetail } from '@/api/knowledge/index';
 import { getDicts } from '@/api/system/dict/data/index';
 
 const report = ref({

src/views/knowledge/knowledge-management/index.vue

@@ -133,8 +133,8 @@
 <script setup lang="ts">
 import { ref, reactive, onMounted } from 'vue';
 import { ElMessage } from 'element-plus';
-import { fetchReports, addReport, updateReport, deleteReport } from '@/api/kenowledge';
-import { AddReportParams, QueryParams, ReportItem } from '@/api/kenowledge/types';
+import { fetchReports, addReport, updateReport, deleteReport } from '@/api/knowledge';
+import { AddReportParams, QueryParams, ReportItem } from '@/api/knowledge/types';
 // import ChunkUpload from '@/components/ChunkUpload/index.vue';
 import { getDicts } from '@/api/system/dict/data';
 import router from '@/router';
@@ -309,7 +309,7 @@ const handleDelete = async (row: ReportItem) => {
         message: '已取消删除'
       });
     });
-  /*  
+  /*
   try {
     await deleteReport(row.reportId);
     ElMessage.success('删除成功');

src/views/knowledge/knowledgeAnalysis/index.vue

@@ -90,7 +90,7 @@
 import { option1, option2, option3 } from './options';
 import { deepClone } from '@/utils';
 import { toRefs } from 'vue';
-import { fetchReports } from '@/api/kenowledge';
+import { fetchReports } from '@/api/knowledge';
 
 const proxy = getCurrentInstance()?.proxy;
 // 事件类型统计