西海岸-基础设施：无人机、单兵申请成功后，页面应该返回无人机页面

front/src/views/home/infrastructurePage.vue

@@ -5,24 +5,15 @@
     <div class="infrastructrue-tab">
       <div v-for="(item, index) in tabList" :key="index" class="tabBox">
         <b class="leftType">{{ item.title }}</b>
-        <el-button
+        <el-button @click="nullClick" v-if="item.title == '视频标签'" type="small">
-          @click="nullClick"
-          v-if="item.title == '视频标签'"
-          type="small"
-        >
           清空
         </el-button>
-        <span
+        <span v-for="itemContent in item.content" :key="itemContent" @click="tabClick(index, itemContent)" :class="
-          v-for="itemContent in item.content"
-          :key="itemContent"
-          @click="tabClick(index, itemContent)"
-          :class="
           clickList[index].content.indexOf(itemContent.labelName) != -1 ||
           clickList[index].content.indexOf(itemContent) != -1
             ? 'down'
             : ''
-          "
+        ">
-        >
           {{ itemContent.labelName || itemContent }}
         </span>
       </div>
@@ -30,35 +21,19 @@
 
     <div v-if="!room" class="roomBox">
       <div class="leftMake">
-        <div
+        <div class="leftTop" @click="roomResults" :class="roomYuyue ? 'roomBackground' : 'nullBackground'">
-          class="leftTop"
-          @click="roomResults"
-          :class="roomYuyue ? 'roomBackground' : 'nullBackground'"
-        >
           会议室预约
         </div>
-        <div
+        <div class="leftBottom" @click="result" :class="roomResult ? 'roomBackground' : 'nullBackground'">
-          class="leftBottom"
-          @click="result"
-          :class="roomResult ? 'roomBackground' : 'nullBackground'"
-        >
           预约结果
         </div>
       </div>
       <div class="roomSearch">
         <span>会议室搜索</span>
         <div class="searchInput">
-          <a-input-search
+          <a-input-search v-model:value="roomInput" placeholder="请输入关键词" enter-button="搜索" size="large"
-            v-model:value="roomInput"
+            @search="onSearch" />
-            placeholder="请输入关键词"
+          <a-button style="width: 0.8rem; height: 0.36rem; margin-left: 0.7rem" @click="reSetSearch">
-            enter-button="搜索"
-            size="large"
-            @search="onSearch"
-          />
-          <a-button
-            style="width: 0.8rem; height: 0.36rem; margin-left: 0.7rem"
-            @click="reSetSearch"
-          >
             重置
           </a-button>
         </div>
@@ -69,40 +44,23 @@
           <div class="roomTime">
             <span>可用时间查询</span>
             <a-space direction="vertical" class="roomSpace">
-              <a-date-picker
+              <a-date-picker v-model:value="roomCerateDate" placeholder="开始日期" value-format="YYYY-MM-DD" />
-                v-model:value="roomCerateDate"
+              <a-time-picker v-model:value="roomCreateTime" placeholder="开始时间" value-format="HH:mm:ss"
-                placeholder="开始日期"
+                :disabledHours="disabledStartHours" :disabledMinutes="disabledStartMinutes"
-                value-format="YYYY-MM-DD"
+                :disabledSeconds="disabledStartSeconds" />
-              />
+              <a-time-picker v-model:value="roomEndTime" placeholder="结束时间" value-format="HH:mm:ss"
-              <a-time-picker
+                :disabledHours="disabledEndHours" :disabledMinutes="disabledEndMinutes"
-                v-model:value="roomCreateTime"
+                :disabledSeconds="disabledEndSeconds" />
-                placeholder="开始时间"
-                value-format="HH:mm:ss"
-                :disabledHours="disabledStartHours"
-                :disabledMinutes="disabledStartMinutes"
-                :disabledSeconds="disabledStartSeconds"
-              />
-              <a-time-picker
-                v-model:value="roomEndTime"
-                placeholder="结束时间"
-                value-format="HH:mm:ss"
-                :disabledHours="disabledEndHours"
-                :disabledMinutes="disabledEndMinutes"
-                :disabledSeconds="disabledEndSeconds"
-              />
             </a-space>
           </div>
         </div>
         <div class="roomItem" v-for="item in roomList" :key="item.id">
           <div class="leftImg">
-            <img
+            <img :src="
-              :src="
               item.pic == null
                 ? 'https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fp1.itc.cn%2Fimages01%2F20201221%2F00885cf666cc4c2ab80c7b4e59259e85.jpeg&refer=http%3A%2F%2Fp1.itc.cn&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1662707222&t=13d3246428ee80cc7519702d5eb6eb7d'
                 : `${item.pic}`
-              "
+            " alt="" />
-              alt=""
-            />
           </div>
           <div class="rightContent">
             <div class="topContent">{{ item.name }}</div>
@@ -115,38 +73,23 @@
               {{ item.description }}
             </div>
           </div>
-          <a-button
+          <a-button style="
-            style="
               margin-left: 0.8rem;
               background: #e1edfa;
               color: #0087ff;
               border: none;
               border-radius: 0.06rem;
-            "
+            " @click="appointment(item)">
-            @click="appointment(item)"
-          >
             预约
           </a-button>
         </div>
-        <a-pagination
+        <a-pagination v-model:current="roomPage" v-model:pageSize="roomLimit" show-quick-jumper :total="roomTotal"
-          v-model:current="roomPage"
+          :page-size-options="pageSizeOptions" @change="onRoomChange" @showSizeChange="onShowSizeChange"
-          v-model:pageSize="roomLimit"
+          show-size-changer />
-          show-quick-jumper
-          :total="roomTotal"
-          :page-size-options="pageSizeOptions"
-          @change="onRoomChange"
-          @showSizeChange="onShowSizeChange"
-          show-size-changer
-        />
       </div>
       <div v-if="roomResult" style="display: grid">
-        <a-table
+        <a-table :columns="columnsRomm" :data-source="dataRoom" :filterMultiple="false" :align="center"
-          :columns="columnsRomm"
+          :pagination="false">
-          :data-source="dataRoom"
-          :filterMultiple="false"
-          :align="center"
-          :pagination="false"
-        >
           <template #bodyCell="{ column, record }">
             <template v-if="column.key === 'bookDate'">
               <span>
@@ -171,38 +114,20 @@
             </template>
           </template>
         </a-table>
-        <a-pagination
+        <a-pagination v-model:current="roomPage" v-model:pageSize="roomLimit" show-quick-jumper :total="roomTotal"
-          v-model:current="roomPage"
+          :page-size-options="pageSizeOptionsChengguo" @change="onRoomChangeChengguo"
-          v-model:pageSize="roomLimit"
+          @showSizeChange="onShowSizeChangeChengguo" show-size-changer />
-          show-quick-jumper
-          :total="roomTotal"
-          :page-size-options="pageSizeOptionsChengguo"
-          @change="onRoomChangeChengguo"
-          @showSizeChange="onShowSizeChangeChengguo"
-          show-size-changer
-        />
       </div>
-      <a-modal
+      <a-modal v-model:visible="visibleRoom" width="10rem" title="预约详情" :body-style="bodystyle" class="modalClass"
-        v-model:visible="visibleRoom"
+        :footer="null">
-        width="10rem"
-        title="预约详情"
-        :body-style="bodystyle"
-        class="modalClass"
-        :footer="null"
-      >
         <div class="modalResult" style="margin-bottom: 0.05rem">预约结果</div>
-        <div
+        <div style="
-          style="
             width: 100%;
             height: 0.01rem;
             border-top: 1px solid #ccc;
             transform: scaleY(0.5);
-          "
+          "></div>
-        ></div>
+        <div class="modalExamine" style="display: flex; flex-direction: column; margin-top: 0.2rem">
-        <div
-          class="modalExamine"
-          style="display: flex; flex-direction: column; margin-top: 0.2rem"
-        >
           <span style="margin-bottom: 0.2rem">
             审核结果：{{
             lookData.state == 2
@@ -217,29 +142,24 @@
           </span>
         </div>
         <div class="modalYuyue" style="margin-bottom: 0.05rem">预约信息</div>
-        <div
+        <div style="
-          style="
             width: 100%;
             height: 0.01rem;
             border-top: 1px solid #ccc;
             transform: scaleY(0.5);
-          "
+          "></div>
-        ></div>
         <div class="modalTime" style="margin-top: 0.2rem">
           <div>
             预约时段：{{ lookData.bookDate }} {{ lookData.startTime }}-{{
             lookData.endTime
             }}
           </div>
-          <div
+          <div class="modalContent" style="
-            class="modalContent"
-            style="
               width: 7.5rem;
               display: flex;
               justify-content: space-between;
               margin: 0.15rem 0 0.15rem 0;
-            "
+            ">
-          >
             <span>预约人：{{ lookData.name }}</span>
             <span>联系方式：{{ lookData.phone }}</span>
             <span>预约部门：{{ lookData.dept }}</span>
@@ -249,43 +169,18 @@
           使用事项：{{ lookData.matter }}
         </div>
       </a-modal>
-      <a-modal
+      <a-modal v-model:visible="appointmentRoom" title="会议室预约" width="10rem" @ok="handleOk" :body-style="bodystyle"
-        v-model:visible="appointmentRoom"
+        class="appModal" :footer="null">
-        title="会议室预约"
+        <a-form :model="formState" name="basic" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }" autocomplete="off"
-        width="10rem"
+          @finish="onFinish" @finishFailed="onFinishFailed" :labelAlign="labelPosition">
-        @ok="handleOk"
-        :body-style="bodystyle"
-        class="appModal"
-        :footer="null"
-      >
-        <a-form
-          :model="formState"
-          name="basic"
-          :label-col="{ span: 8 }"
-          :wrapper-col="{ span: 16 }"
-          autocomplete="off"
-          @finish="onFinish"
-          @finishFailed="onFinishFailed"
-          :labelAlign="labelPosition"
-        >
           <a-row>
             <a-col :span="8">
-              <a-form-item
+              <a-form-item name="bookDate" label="预约日期" v-bind="validateInfos.bookDate"
-                name="bookDate"
+                @blur="validate('create', { trigger: 'blur' }).catch(() => {})">
-                label="预约日期"
+                <a-date-picker style="width: 72%" v-model:value="formState.bookDate" value-format="YYYY-MM-DD"
-                v-bind="validateInfos.bookDate"
+                  @change="handleChange" />
-                @blur="validate('create', { trigger: 'blur' }).catch(() => {})"
-              >
-                <a-date-picker
-                  style="width: 72%"
-                  v-model:value="formState.bookDate"
-                  value-format="YYYY-MM-DD"
-                  @change="handleChange"
-                />
               </a-form-item>
-              <div
+              <div :class="roomDateList[0] != null ? 'jinggaoD' : 'jinggaoNull'">
-                :class="roomDateList[0] != null ? 'jinggaoD' : 'jinggaoNull'"
-              >
                 <div class="imgJinggao"></div>
                 <span style="color: #da2a13; font-size: 0.12rem">
                   当日会议室可用时段：{{ roomDateList[0] }}
@@ -293,40 +188,21 @@
               </div>
             </a-col>
             <a-col :span="8">
-              <a-form-item
+              <a-form-item name="startTime" label="预约时段" v-bind="validateInfos.startTime" style="display: flex">
-                name="startTime"
+                <a-time-picker v-model:value="formState.startTime" placeholder="开始时间" value-format="HH:mm:ss"
-                label="预约时段"
+                  :disabledHours="disabledTimeHours" :disabledMinutes="disabledTimeMinutes"
-                v-bind="validateInfos.startTime"
+                  :disabledSeconds="disabledTimeSeconds" />
-                style="display: flex"
-              >
-                <a-time-picker
-                  v-model:value="formState.startTime"
-                  placeholder="开始时间"
-                  value-format="HH:mm:ss"
-                  :disabledHours="disabledTimeHours"
-                  :disabledMinutes="disabledTimeMinutes"
-                  :disabledSeconds="disabledTimeSeconds"
-                />
               </a-form-item>
             </a-col>
             <a-col :span="8">
-              <a-time-picker
+              <a-time-picker v-model:value="formState.endTime" placeholder="结束时间" value-format="HH:mm:ss"
-                v-model:value="formState.endTime"
+                :disabledHours="disabledTimeEndHours" :disabledMinutes="disabledTimeEndMinutes"
-                placeholder="结束时间"
+                :disabledSeconds="disabledTimeEndSeconds" />
-                value-format="HH:mm:ss"
-                :disabledHours="disabledTimeEndHours"
-                :disabledMinutes="disabledTimeEndMinutes"
-                :disabledSeconds="disabledTimeEndSeconds"
-              />
             </a-col>
           </a-row>
           <a-row style="margin-top: 0.4rem">
             <a-col :span="8">
-              <a-form-item
+              <a-form-item name="name" label="预约人" v-bind="validateInfos.name">
-                name="name"
-                label="预约人"
-                v-bind="validateInfos.name"
-              >
                 <a-input v-model:value="formState.name" style="width: 72%" />
               </a-form-item>
             </a-col>
@@ -336,42 +212,23 @@
               </a-form-item>
             </a-col>
             <a-col :span="8">
-              <a-form-item
+              <a-form-item name="dept" label="预约部门" v-bind="validateInfos.dept">
-                name="dept"
-                label="预约部门"
-                v-bind="validateInfos.dept"
-              >
                 <a-input v-model:value="formState.dept" style="width: 72%" />
               </a-form-item>
             </a-col>
           </a-row>
           <a-row style="margin-top: 0.4rem">
             <a-col :span="24">
-              <a-form-item
+              <a-form-item name="matter" v-bind="validateInfos.matter" label="使用事项" class="introduction">
-                name="matter"
-                v-bind="validateInfos.matter"
-                label="使用事项"
-                class="introduction"
-              >
                 <a-textarea v-model:value="formState.matter" />
               </a-form-item>
             </a-col>
           </a-row>
           <a-row style="margin-top: 0.4rem">
             <a-col :span="24">
-              <a-form-item
+              <a-form-item name="uploadRoom" label="附件上传" class="introduction">
-                name="uploadRoom"
+                <a-upload :max-count="1" accept=".doc,.docx,pdf" v-model:file-list="fileList"
-                label="附件上传"
+                  :action="`${apiURL}/upload`" @remove="handleRemove" @change="roomUpload">
-                class="introduction"
-              >
-                <a-upload
-                  :max-count="1"
-                  accept=".doc,.docx,pdf"
-                  v-model:file-list="fileList"
-                  :action="`${apiURL}/upload`"
-                  @remove="handleRemove"
-                  @change="roomUpload"
-                >
                   <a-button>
                     <upload-outlined>选择上传附件</upload-outlined>
                   </a-button>
@@ -382,18 +239,11 @@
               </a-form-item>
             </a-col>
           </a-row>
-          <a-form-item
+          <a-form-item :wrapper-col="{ span: 14, offset: 4 }" style="text-align: center; margin-top: 0.4rem">
-            :wrapper-col="{ span: 14, offset: 4 }"
-            style="text-align: center; margin-top: 0.4rem"
-          >
             <a-button @click="appointmentRoom = false" type="primary" danger>
               取消
             </a-button>
-            <a-button
+            <a-button style="margin-left: 10px" type="primary" @click="onSubmit">
-              style="margin-left: 10px"
-              type="primary"
-              @click="onSubmit"
-            >
               提交
             </a-button>
           </a-form-item>
@@ -423,47 +273,23 @@
         <!-- 右侧 -->
         <div class="contentRight">
           <div class="searchInput" v-if="isXiHaiAn">
-            <a-input-search
+            <a-input-search v-model:value="mapSearchParam.cameraName" placeholder="请输入关键词" enter-button="搜索"
-              v-model:value="mapSearchParam.cameraName"
+              size="large" @change="(e) => getCamera(true, e.target.value)" />
-              placeholder="请输入关键词"
+            <a-button type="primary" style="width: 0.8rem; height: 0.36rem; margin-left: 0.7rem" @click="clean">
-              enter-button="搜索"
-              size="large"
-              @change="(e) => getCamera(true, e.target.value)"
-            />
-            <a-button
-              type="primary"
-              style="width: 0.8rem; height: 0.36rem; margin-left: 0.7rem"
-              @click="clean"
-            >
               重置
             </a-button>
           </div>
           <i class="boundary"></i>
           <!-- 批量预览 -->
-          <a-button
+          <a-button type="primary" @click="batchPreview" class="buttonAdd" v-if="isXiHaiAn">
-            type="primary"
-            @click="batchPreview"
-            class="buttonAdd"
-            v-if="isXiHaiAn"
-          >
             批量预览
           </a-button>
           <!-- 添加至申购车 -->
-          <a-button
+          <a-button v-if="isXiHaiAn" type="primary" @click="addShoppingCart" class="buttonAdd">
-            v-if="isXiHaiAn"
-            type="primary"
-            @click="addShoppingCart"
-            class="buttonAdd"
-          >
             添加至申购车
           </a-button>
           <!-- 一键申请 -->
-          <a-button
+          <a-button v-if="isXiHaiAn" type="primary" @click="apply" class="buttonAdd">
-            v-if="isXiHaiAn"
-            type="primary"
-            @click="apply"
-            class="buttonAdd"
-          >
             一键申请
           </a-button>
           <a-button v-else type="primary" @click="goToWeb" class="buttonAdd">
@@ -473,39 +299,27 @@
       </div>
       <!-- 表格 -->
       <div class="infrastructrue-table" v-if="!wrjFlag">
-        <a-table
+        <a-table class="ant-table-striped" :dataSource="dataSource" :columns="columns" :scroll="{ y: tableHeight }"
-          class="ant-table-striped"
+          rowKey="channelId" :rowClassName="
-          :dataSource="dataSource"
-          :columns="columns"
-          :scroll="{ y: tableHeight }"
-          rowKey="channelId"
-          :rowClassName="
             (record, index) => (index % 2 === 1 ? 'table-striped' : null)
-          "
+          " :pagination="pagination" @change="handleTableChange" :row-selection="{
-          :pagination="pagination"
-          @change="handleTableChange"
-          :row-selection="{
             selectedRowKeys: selectedRowKeys,
             onSelect: onSelectChange,
             onSelectAll: onSelectAll,
-          }"
+          }" :loading="loadingCamera">
-          :loading="loadingCamera"
-        >
           <template #bodyCell="{ column, record }">
             <template v-if="isXiHaiAn && column.dataIndex === 'status'">
               <span>{{ statusText[record.status] || '' }}</span>
             </template>
             <template v-if="column.dataIndex === 'operation'">
-              <a
+              <a @click="
-                @click="
                 openVideo(
                   record.channelCode ||
                     record.channelId ||
                     record.channelCode.channelId,
                   record
                 )
-                "
+              ">
-              >
                 预览
               </a>
             </template>
@@ -514,25 +328,13 @@
       </div>
       <!-- 西海岸-无人机、单兵设备 -->
       <div class="infrastructrue-table" v-else-if="isXiHaiAn && wrjFlag">
-        <a-table
+        <a-table class="ant-table-striped" :dataSource="dataSource2" :columns="columns2" :scroll="{ y: tableHeight }"
-          class="ant-table-striped"
+          rowKey="channelId" :rowClassName="
-          :dataSource="dataSource2"
-          :columns="columns2"
-          :scroll="{ y: tableHeight }"
-          rowKey="channelId"
-          :rowClassName="
             (record, index) => (index % 2 === 1 ? 'table-striped' : null)
-          "
+          " :pagination="pagination" @change="handleTableChange">
-          :pagination="pagination"
-          @change="handleTableChange"
-        >
           <template #bodyCell="{ column, record }">
             <template v-if="column.dataIndex === 'operation'">
-              <a-button
+              <a-button @click="goToApply(record)" type="link" :disabled="record.state != 1">
-                @click="goToApply(record)"
-                type="link"
-                :disabled="record.state != 1"
-              >
                 申请
               </a-button>
               <a-button @click="showWrj(record)" type="link">详情</a-button>
@@ -541,19 +343,10 @@
         </a-table>
       </div>
       <!-- 单个预览弹窗 -->
-      <a-modal
+      <a-modal wrapClassName="single-preview-modal" v-model:visible="visible" title="视频预览" :width="960" destroyOnClose>
-        wrapClassName="single-preview-modal"
-        v-model:visible="visible"
-        title="视频预览"
-        :width="960"
-        destroyOnClose
-      >
         <template #footer></template>
         <div style="width: 100%; display: flex; justify-content: center">
-          <div
+          <div style="width: 100%; height: 100%; position: relative" v-show="isXiHaiAn">
-            style="width: 100%; height: 100%; position: relative"
-            v-show="isXiHaiAn"
-          >
             <!-- 西海岸--预览视频--遮罩 todo-->
             <div class="video-cover" @click="videoShowMsg"></div>
             <div class="waterMark waterMark-left-top">
@@ -574,138 +367,70 @@
       </a-modal>
 
       <!-- 图片预览 -->
-      <a-modal
+      <a-modal wrapClassName="single-preview-modal" v-model:visible="picVisible" title="图片预览" :width="960"
-        wrapClassName="single-preview-modal"
+        destroyOnClose>
-        v-model:visible="picVisible"
-        title="图片预览"
-        :width="960"
-        destroyOnClose
-      >
         <template #footer></template>
         <div style="width: 100%; display: flex; justify-content: center">
           <a-image :src="options.src" />
         </div>
       </a-modal>
       <!-- 批量预览图片弹窗 -->
-      <a-modal
+      <a-modal wrapClassName="batch-preview-modal" v-model:visible="batchPicVisible" title="图片批量预览" :width="1060"
-        wrapClassName="batch-preview-modal"
+        destroyOnClose @cancel="videoClean">
-        v-model:visible="batchPicVisible"
-        title="图片批量预览"
-        :width="1060"
-        destroyOnClose
-        @cancel="videoClean"
-      >
         <template #footer></template>
         <div class="batch-video">
-          <div
+          <div v-for="item in videoList" :key="item.id" style="width: 100%; height: 100%">
-            v-for="item in videoList"
+            <a-image width="500px" height="281px" :src="item.options.src"
-            :key="item.id"
+              fallback="data:image/png;base64,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" />
-            style="width: 100%; height: 100%"
-          >
-            <a-image
-              width="500px"
-              height="281px"
-              :src="item.options.src"
-              fallback="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMIAAADDCAYAAADQvc6UAAABRWlDQ1BJQ0MgUHJvZmlsZQAAKJFjYGASSSwoyGFhYGDIzSspCnJ3UoiIjFJgf8LAwSDCIMogwMCcmFxc4BgQ4ANUwgCjUcG3awyMIPqyLsis7PPOq3QdDFcvjV3jOD1boQVTPQrgSkktTgbSf4A4LbmgqISBgTEFyFYuLykAsTuAbJEioKOA7DkgdjqEvQHEToKwj4DVhAQ5A9k3gGyB5IxEoBmML4BsnSQk8XQkNtReEOBxcfXxUQg1Mjc0dyHgXNJBSWpFCYh2zi+oLMpMzyhRcASGUqqCZ16yno6CkYGRAQMDKMwhqj/fAIcloxgHQqxAjIHBEugw5sUIsSQpBobtQPdLciLEVJYzMPBHMDBsayhILEqEO4DxG0txmrERhM29nYGBddr//5/DGRjYNRkY/l7////39v///y4Dmn+LgeHANwDrkl1AuO+pmgAAADhlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAqACAAQAAAABAAAAwqADAAQAAAABAAAAwwAAAAD9b/HnAAAHlklEQVR4Ae3dP3PTWBSGcbGzM6GCKqlIBRV0dHRJFarQ0eUT8LH4BnRU0NHR0UEFVdIlFRV7TzRksomPY8uykTk/zewQfKw/9znv4yvJynLv4uLiV2dBoDiBf4qP3/ARuCRABEFAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghgg0Aj8i0JO4OzsrPv69Wv+hi2qPHr0qNvf39+iI97soRIh4f3z58/u7du3SXX7Xt7Z2enevHmzfQe+oSN2apSAPj09TSrb+XKI/f379+08+A0cNRE2ANkupk+ACNPvkSPcAAEibACyXUyfABGm3yNHuAECRNgAZLuYPgEirKlHu7u7XdyytGwHAd8jjNyng4OD7vnz51dbPT8/7z58+NB9+/bt6jU/TI+AGWHEnrx48eJ/EsSmHzx40L18+fLyzxF3ZVMjEyDCiEDjMYZZS5wiPXnyZFbJaxMhQIQRGzHvWR7XCyOCXsOmiDAi1HmPMMQjDpbpEiDCiL358eNHurW/5SnWdIBbXiDCiA38/Pnzrce2YyZ4//59F3ePLNMl4PbpiL2J0L979+7yDtHDhw8vtzzvdGnEXdvUigSIsCLAWavHp/+qM0BcXMd/q25n1vF57TYBp0a3mUzilePj4+7k5KSLb6gt6ydAhPUzXnoPR0dHl79WGTNCfBnn1uvSCJdegQhLI1vvCk+fPu2ePXt2tZOYEV6/fn31dz+shwAR1sP1cqvLntbEN9MxA9xcYjsxS1jWR4AIa2Ibzx0tc44fYX/16lV6NDFLXH+YL32jwiACRBiEbf5KcXoTIsQSpzXx4N28Ja4BQoK7rgXiydbHjx/P25TaQAJEGAguWy0+2Q8PD6/Ki4R8EVl+bzBOnZY95fq9rj9zAkTI2SxdidBHqG9+skdw43borCXO/ZcJdraPWdv22uIEiLA4q7nvvCug8WTqzQveOH26fodo7g6uFe/a17W3+nFBAkRYENRdb1vkkz1CH9cPsVy/jrhr27PqMYvENYNlHAIesRiBYwRy0V+8iXP8+/fvX11Mr7L7ECueb/r48eMqm7FuI2BGWDEG8cm+7G3NEOfmdcTQw4h9/55lhm7DekRYKQPZF2ArbXTAyu4kDYB2YxUzwg0gi/41ztHnfQG26HbGel/crVrm7tNY+/1btkOEAZ2M05r4FB7r9GbAIdxaZYrHdOsgJ/wCEQY0J74TmOKnbxxT9n3FgGGWWsVdowHtjt9Nnvf7yQM2aZU/TIAIAxrw6dOnAWtZZcoEnBpNuTuObWMEiLAx1HY0ZQJEmHJ3HNvGCBBhY6jtaMoEiJB0Z29vL6ls58vxPcO8/zfrdo5qvKO+d3Fx8Wu8zf1dW4p/cPzLly/dtv9Ts/EbcvGAHhHyfBIhZ6NSiIBTo0LNNtScABFyNiqFCBChULMNNSdAhJyNSiECRCjUbEPNCRAhZ6NSiAARCjXbUHMCRMjZqBQiQIRCzTbUnAARcjYqhQgQoVCzDTUnQIScjUohAkQo1GxDzQkQIWejUogAEQo121BzAkTI2agUIkCEQs021JwAEXI2KoUIEKFQsw01J0CEnI1KIQJEKNRsQ80JECFno1KIABEKNdtQcwJEyNmoFCJAhELNNtScABFyNiqFCBChULMNNSdAhJyNSiECRCjUbEPNCRAhZ6NSiAARCjXbUHMCRMjZqBQiQIRCzTbUnAARcjYqhQgQoVCzDTUnQIScjUohAkQo1GxDzQkQIWejUogAEQo121BzAkTI2agUIkCEQs021JwAEXI2KoUIEKFQsw01J0CEnI1KIQJEKNRsQ80JECFno1KIABEKNdtQcwJEyNmoFCJAhELNNtScABFyNiqFCBChULMNNSdAhJyNSiECRCjUbEPNCRAhZ6NSiAARCjXbUHMCRMjZqBQiQIRCzTbUnAARcjYqhQgQoVCzDTUnQIScjUohAkQo1GxDzQkQIWejUogAEQo121BzAkTI2agUIkCEQs021JwAEXI2KoUIEKFQsw01J0CEnI1KIQJEKNRsQ80JECFno1KIABEKNdtQcwJEyNmoFCJAhELNNtScABFyNiqFCBChULMNNSdAhJyNSiEC/wGgKKC4YMA4TAAAAABJRU5ErkJggg=="
-            />
           </div>
         </div>
-        <a-pagination
+        <a-pagination v-model:current="current" :total="videoTotal" defaultPageSize="4" :showSizeChanger="false"
-          v-model:current="current"
+          @change="batchPicturePreview" show-less-items />
-          :total="videoTotal"
-          defaultPageSize="4"
-          :showSizeChanger="false"
-          @change="batchPicturePreview"
-          show-less-items
-        />
       </a-modal>
 
       <!-- 批量预览视频弹窗 -->
-      <a-modal
+      <a-modal wrapClassName="batch-preview-modal" v-model:visible="batchVisible" title="视频批量预览" :width="1060"
-        wrapClassName="batch-preview-modal"
+        destroyOnClose @cancel="videoClean">
-        v-model:visible="batchVisible"
-        title="视频批量预览"
-        :width="1060"
-        destroyOnClose
-        @cancel="videoClean"
-      >
         <template #footer></template>
         <div class="batch-video">
-          <div
+          <div v-for="(item, index) in videoList" :key="item.id" style="width: 100%; height: 100%; position: relative">
-            v-for="(item, index) in videoList"
-            :key="item.id"
-            style="width: 100%; height: 100%; position: relative"
-          >
             <!-- 批量预览视频--遮罩 -->
-            <div
+            <div class="batch-video-cover" @click="videoShowMsg(index)" v-show="isXiHaiAn"></div>
-              class="batch-video-cover"
+            <div class="batch-waterMark batch-waterMark-left-top" v-show="isXiHaiAn">
-              @click="videoShowMsg(index)"
-              v-show="isXiHaiAn"
-            ></div>
-            <div
-              class="batch-waterMark batch-waterMark-left-top"
-              v-show="isXiHaiAn"
-            >
               {{ userInfo.usernameShow }}
             </div>
-            <div
+            <div class="batch-waterMark batch-waterMark-right-top" v-show="isXiHaiAn">
-              class="batch-waterMark batch-waterMark-right-top"
-              v-show="isXiHaiAn"
-            >
               {{ userInfo.realNameShow }}
             </div>
-            <div
+            <div class="batch-waterMark batch-waterMark-left-bottom" v-show="isXiHaiAn">
-              class="batch-waterMark batch-waterMark-left-bottom"
-              v-show="isXiHaiAn"
-            >
               {{ userInfo.usernameShow }}
             </div>
-            <div
+            <div class="batch-waterMark batch-waterMark-right-bottom" v-show="isXiHaiAn">
-              class="batch-waterMark batch-waterMark-right-bottom"
-              v-show="isXiHaiAn"
-            >
               {{ userInfo.realNameShow }}
             </div>
             <p></p>
             <vue3VideoPlay v-bind="item.options" />
           </div>
         </div>
-        <a-pagination
+        <a-pagination v-model:current="current" :total="videoTotal" defaultPageSize="4" :showSizeChanger="false"
-          v-model:current="current"
+          @change="batchPreview" show-less-items />
-          :total="videoTotal"
-          defaultPageSize="4"
-          :showSizeChanger="false"
-          @change="batchPreview"
-          show-less-items
-        />
       </a-modal>
 
-      <a-modal
+      <a-modal wrapClassName="wrj" v-model:visible="wrjVisible" :width="1000" :title="wrjName + '详情'"
-        wrapClassName="wrj"
+        @ok="wrjVisible = false">
-        v-model:visible="wrjVisible"
-        :width="1000"
-        :title="wrjName + '详情'"
-        @ok="wrjVisible = false"
-      >
         <template #footer></template>
         <div v-for="(db, key) in wrjData" :key="key">
           <template v-if="typeof db == 'object'">
-            <div
+            <div style="
-              style="
                 font-size: 20px;
                 font-weight: 600;
                 margin: 10px 0;
                 text-align: center;
-              "
+              ">
-            >
               {{ db.attrType || '--' }}
             </div>
             <template v-if="db.attrValue">
-              <div
+              <div style="padding: 0 30px" v-for="(value, key2) in JSON.parse(db.attrValue)" :key="value">
-                style="padding: 0 30px"
-                v-for="(value, key2) in JSON.parse(db.attrValue)"
-                :key="value"
-              >
                 {{ key2 + '：' + value }}
               </div>
             </template>
@@ -898,10 +623,11 @@
 }
 // 消息列表页面
 let formPage = router.currentRoute.value.query.formPage || ''
+// 设施类型--无人机和单兵设备
+let facilitiesType = router.currentRoute.value.query.facilitiesType || ''
 onMounted(() => {
   // 获取用户信息
   handleUser()
-
   if (jcssType.value) {
     tabClick(0, jcssType.value)
     if (jcssType.value == '视频资源') {
@@ -909,12 +635,16 @@
     }
   } else {
     if (isXiHaiAn) {
+      if (facilitiesType) {
+        tabClick(0, facilitiesType)
+      } else {
         let _obj = {
           title: '视频标签',
           content: ['视频资源'],
         }
         clickList.value.push(_obj)
         tabClick(0, '视频资源')
+      }
     } else {
       // 默认选中
       if (formPage && formPage == 'noticePage') {