瀏覽代碼

Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/types/components.d.ts
zhangyihao 3 月之前
父節點
當前提交
8bba1724b9
共有 2 個文件被更改,包括 26 次插入59 次删除
  1. 2 12
      src/types/components.d.ts
  2. 24 47
      src/views/emergencyCommandMap/LeftSection/VideoMonitorEdit.vue

+ 2 - 12
src/types/components.d.ts

@@ -24,20 +24,14 @@ 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']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     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']
@@ -50,30 +44,26 @@ declare module 'vue' {
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
-    ElLink: typeof import('element-plus/es')['ElLink']
+    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     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']
-    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
+    ElSlider: typeof import('element-plus/es')['ElSlider']
     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']
     ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
-    ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
     ElUpload: typeof import('element-plus/es')['ElUpload']
     ExcelEditor: typeof import('./../components/ExcelEditor/index.vue')['default']
     FileUpload: typeof import('./../components/FileUpload/index.vue')['default']

+ 24 - 47
src/views/emergencyCommandMap/LeftSection/VideoMonitorEdit.vue

@@ -1,39 +1,24 @@
 <template>
-  <Dialog customShow type="xl" title="视频监控" class="dialog" hide-footer @close="reset">
+  <Dialog custom-show type="xl" title="视频监控" class="dialog" hide-footer @close="reset">
     <div class="search-box">
       <div class="box-left">
-        <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="200px" label-position="left">
-          <!--          <el-form-item label="实景视频" prop="eventType">-->
-          <!--            <el-select-->
-          <!--              v-model="queryParams.realisticVideoType"-->
-          <!--              size="large"-->
-          <!--              class="custom-select"-->
-          <!--              popper-class="custom-select-popper"-->
-          <!--              :teleported="false"-->
-          <!--              placeholder="全部"-->
-          <!--            >-->
-          <!--              <el-option label="全部" value=""></el-option>-->
-          <!--              <el-option v-for="item in realistic_video" key="item.value" :label="item.label" :value="item.value" />-->
-          <!--            </el-select>-->
-          <!--          </el-form-item>-->
+        <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="70px" label-position="left">
           <el-form-item prop="name">
-            <el-input v-model="queryParams.name" class="custom-input2" placeholder="请输入摄像头名称" size="large" style="width: 500px" />
+            <el-input v-model="queryParams.name" class="custom-input2" placeholder="请输入摄像头名称" style="width: 500px" />
+          </el-form-item>
+          <el-form-item label="实景视频" prop="dict_value">
+            <el-select
+              v-model="queryParams.dict_value"
+              class="custom-select"
+              popper-class="custom-select-popper"
+              :teleported="false"
+              placeholder="全部"
+              @change="handleQuery"
+            >
+              <el-option label="全部" value="" />
+              <el-option v-for="item in video_type" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
           </el-form-item>
-
-          <span>实景视频:</span>
-          <el-select
-            v-model="active"
-            placeholder="请选择"
-            class="custom-select"
-            popper-class="custom-select-popper"
-            :teleported="false"
-            style="width: 140px"
-            @change="initData"
-          >
-            <el-option v-for="item in videoList" :key="item.name" :label="item.name" :value="item.value" />
-          </el-select>
-
-
           <el-form-item>
             <div class="common-btn-primary" @click="handleQuery">搜索</div>
             <div class="common-btn" @click="resetQuery">重置</div>
@@ -81,6 +66,7 @@
         layout="total, prev, pager, next"
         @pagination="getList"
       />
+      <div v-if="total === 0" style="width: 100%; text-align: center; font-size: 18px; font-weight: bold">暂无数据</div>
     </div>
     <div id="container" style="display: none"></div>
   </Dialog>
@@ -108,27 +94,16 @@ const props = defineProps({
 });
 const emits = defineEmits(['update:modelValue']);
 const proxy = getCurrentInstance()?.proxy;
-const { realistic_video } = toRefs<any>(proxy?.useDict('realistic_video'));
+const { video_type } = toRefs<any>(proxy?.useDict('video_type'));
 
 //查看更多数据
 const queryFormRef = ref();
 const queryParams = reactive({
   current: 1,
   size: 8,
-  realisticVideoType: '',
+  dict_value: '',
   name: ''
 });
-const active = ref('0');
-const videoList = ref([
-  { name: '全量视频', value: '0' },
-  { name: '江河湖库视频', value: '1' },
-  { name: '林火视频', value: '2' },
-  { name: '高速公路视频', value: '3' },
-  { name: '汛期视频', value: '4' },
-  { name: '雨情视频', value: '5' },
-  { name: '台风视频', value: '6' },
-  { name: '交通局视频', value: '7' }
-]);
 let total = ref(0);
 let editVideo = ref(false);
 // 选中的视频
@@ -159,10 +134,12 @@ const getList = async () => {
     current: queryParams.current,
     size: queryParams.size,
     query: {
-      name: queryParams.name,
-      realisticVideoType: queryParams.realisticVideoType
+      name: queryParams.name
     }
   };
+  if (!!queryParams.dict_value) {
+    newParams.query.dict_value = queryParams.dict_value;
+  }
   getEmergencyVideoCata(newParams).then((res) => {
     selectData.value.forEach((item) => {
       for (let i = 0; i < res.rows.length; i++) {
@@ -194,7 +171,7 @@ const deleteItem = (index) => {
 /** 表单重置 */
 const reset = () => {
   queryParams.current = 1;
-  queryParams.realisticVideoType = '';
+  queryParams.dict_value = '';
   queryParams.name = '';
   emits('update:modelValue', false);
 };