From 67e009d11074b3558d00bea2fdf7d506b8e7a812 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Mon, 26 Sep 2022 09:26:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/modules/myAgent/ConferenceRoom.vue  | 74 +++++++++----------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/back/src/views/modules/myAgent/ConferenceRoom.vue b/back/src/views/modules/myAgent/ConferenceRoom.vue
index 10478c69..0fd4b614 100644
--- a/back/src/views/modules/myAgent/ConferenceRoom.vue
+++ b/back/src/views/modules/myAgent/ConferenceRoom.vue
@@ -208,7 +208,7 @@
 <script>
 import Cookies from 'js-cookie'
 export default {
-  data() {
+  data () {
     // let validatorImg = (rule, value, callback) => {
     //   console.log(value, 11111111)
     //   //验证器
@@ -231,7 +231,7 @@ export default {
         area: 0,
         capacity: '',
         pic: '',
-        id: '',
+        id: ''
       },
       limit: 10,
       page: 1,
@@ -242,11 +242,11 @@ export default {
       rules: {
         name: [
           { required: true, message: '请输入会议室名称', trigger: 'blur' },
-          { min: 1, trigger: 'blur' },
+          { min: 1, trigger: 'blur' }
         ],
         area: [
           { required: true, message: '请输入会议室面积', trigger: 'blur' },
-          { min: 1, type: 'number', trigger: 'blur' },
+          { min: 1, message: '请输入数字', type: 'number', trigger: 'blur' }
         ],
         description: [
           { required: true, message: '请填写描述内容', trigger: 'blur' },
@@ -254,22 +254,22 @@ export default {
             min: 1,
             max: 500,
             message: '长度在 1 到 500 个字符',
-            trigger: 'blur',
-          },
-        ],
+            trigger: 'blur'
+          }
+        ]
       },
       formLabelWidth: '120px',
       checkImgSuccess: true,
       dialogVisible: false,
-      flge: '',
+      flge: ''
     }
   },
-  mounted() {
+  mounted () {
     this.queryData()
   },
   methods: {
     // 页面查询接口
-    queryData() {
+    queryData () {
       this.$http
         .get(`/meeting/page?limit=${this.limit}&page=${this.page}`)
         .then(({ data: res }) => {
@@ -278,31 +278,31 @@ export default {
         })
     },
     // 分页
-    handleSizeChange(val) {
+    handleSizeChange (val) {
       this.limit = val
       this.queryData()
     },
-    handleCurrentChange(val) {
+    handleCurrentChange (val) {
       this.page = val
       this.queryData()
     },
     // 新增
-    addRooom() {
+    addRooom () {
       this.dialogFormVisible = true
       this.flge = 'add'
       this.ruleForm = {}
       this.fileList = []
     },
-    handlePictureCardPreview(file) {
+    handlePictureCardPreview (file) {
       this.dialogImageUrl = file.url
       this.dialogVisible = true
     },
-    //上传个数限制
-    beforeUpload(file, fileList) {
+    // 上传个数限制
+    beforeUpload (file, fileList) {
       this.$message.error('最多只能上传一张图片！')
     },
-    //图片上传成功时钩子
-    onSuccess(response, file, fileList) {
+    // 图片上传成功时钩子
+    onSuccess (response, file, fileList) {
       const isLt2M = file.size / 1024 / 1024 < 100
       if (!isLt2M) {
         this.$message.error('上传图片大小不能超过100MB！')
@@ -313,17 +313,17 @@ export default {
         this.checkImgSuccess = true
       }
     },
-    //图片删除时钩子
-    onRemove(file, fileList) {
+    // 图片删除时钩子
+    onRemove (file, fileList) {
       this.$nextTick(() => {
         if (fileList.length == 0) {
-          this.checkImgSuccess = false //检查图片是否加载成功
+          this.checkImgSuccess = false // 检查图片是否加载成功
           //   this.$refs.ruleForm.validate() //删除图片,重新触发校验
         }
       })
     },
     // 保存
-    submitForm(formName, i) {
+    submitForm (formName, i) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           if (i === 'add') {
@@ -337,9 +337,9 @@ export default {
             })
           } else if (i === 'edit') {
             this.dialogFormVisible = false
-            this.$http.put(`/meeting`, this.ruleForm).then(({ data: res }) => {
+            this.$http.put('/meeting', this.ruleForm).then(({ data: res }) => {
               this.ruleForm = res.data
-              let imgUrl = { name: res.data.name, url: res.data.pic }
+              const imgUrl = { name: res.data.name, url: res.data.pic }
               this.fileList.push(imgUrl)
             })
           }
@@ -350,7 +350,7 @@ export default {
       })
     },
     // 详情
-    taskDetails(row) {
+    taskDetails (row) {
       this.ruleForm = {}
       this.fileList = []
       this.flge = 'look'
@@ -366,45 +366,45 @@ export default {
         }
       })
     },
-    //修改
-    taskUpdate(row) {
+    // 修改
+    taskUpdate (row) {
       this.dialogFormVisible = true
       this.fileList = []
       this.flge = 'edit'
       this.ruleForm = row
       if (row.pic != null) {
-        let imgUrl = { name: row.name, url: row.pic }
+        const imgUrl = { name: row.name, url: row.pic }
         this.fileList.push(imgUrl)
       } else {
         this.fileList = []
       }
     },
-    //删除图片
-    taskDelete(row) {
+    // 删除图片
+    taskDelete (row) {
       this.$confirm('此操作将永久删除该会议室, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning',
+        type: 'warning'
       })
         .then(() => {
-          this.$http.put(`/meeting`, { delFlag: 1, id: row.id }).then(() => {
+          this.$http.put('/meeting', { delFlag: 1, id: row.id }).then(() => {
             this.queryData()
             this.$message({
               type: 'success',
-              message: '删除成功!',
+              message: '删除成功!'
             })
           })
         })
         .catch(() => {
           this.$message({
             type: 'info',
-            message: '已取消删除',
+            message: '已取消删除'
           })
         })
     },
-    //监听关闭按钮时间
-    outDialog() {},
-  },
+    // 监听关闭按钮时间
+    outDialog () {}
+  }
 }
 </script>
 <style scoped lang="scss">

From 186184c14f356b86bb3fa18758862e611d20ed30 Mon Sep 17 00:00:00 2001
From: unknown <xiaoshangqing@Hisense.ad>
Date: Mon, 26 Sep 2022 09:41:43 +0800
Subject: [PATCH 2/3] new button

---
 front/src/views/home/infrastructurePage.vue   | 3581 +++++++++--------
 .../views/newHome/components/WorkDynamics.vue |   34 +-
 2 files changed, 1884 insertions(+), 1731 deletions(-)

diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 766b2115..50ec24e5 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -5,15 +5,24 @@
     <div class="infrastructrue-tab">
       <div v-for="(item, index) in tabList" :key="index" class="tabBox">
         <b class="leftType">{{ item.title }}</b>
-        <el-button @click="nullClick" v-if="item.title == '视频标签'" type="small">
+        <el-button
+          @click="nullClick"
+          v-if="item.title == '视频标签'"
+          type="small"
+        >
           清空
         </el-button>
-        <span 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'
-            : ''
-        ">
+        <span
+          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>
@@ -21,19 +30,35 @@
 
     <div v-if="!room" class="roomBox">
       <div class="leftMake">
-        <div class="leftTop" @click="roomResults" :class="roomYuyue ? 'roomBackground' : 'nullBackground'">
+        <div
+          class="leftTop"
+          @click="roomResults"
+          :class="roomYuyue ? 'roomBackground' : 'nullBackground'"
+        >
           会议室预约
         </div>
-        <div class="leftBottom" @click="result" :class="roomResult ? 'roomBackground' : 'nullBackground'">
+        <div
+          class="leftBottom"
+          @click="result"
+          :class="roomResult ? 'roomBackground' : 'nullBackground'"
+        >
           预约结果
         </div>
       </div>
       <div class="roomSearch">
         <span>会议室搜索</span>
         <div class="searchInput">
-          <a-input-search v-model:value="roomInput" placeholder="请输入关键词" enter-button="搜索" size="large"
-            @search="onSearch" />
-          <a-button style="width: 0.8rem; height: 0.36rem; margin-left: 0.7rem" @click="reSetSearch">
+          <a-input-search
+            v-model:value="roomInput"
+            placeholder="请输入关键词"
+            enter-button="搜索"
+            size="large"
+            @search="onSearch"
+          />
+          <a-button
+            style="width: 0.8rem; height: 0.36rem; margin-left: 0.7rem"
+            @click="reSetSearch"
+          >
             重置
           </a-button>
         </div>
@@ -44,23 +69,40 @@
           <div class="roomTime">
             <span>可用时间查询</span>
             <a-space direction="vertical" class="roomSpace">
-              <a-date-picker v-model:value="roomCerateDate" placeholder="开始日期" value-format="YYYY-MM-DD" />
-              <a-time-picker v-model:value="roomCreateTime" 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-date-picker
+                v-model:value="roomCerateDate"
+                placeholder="开始日期"
+                value-format="YYYY-MM-DD"
+              />
+              <a-time-picker
+                v-model:value="roomCreateTime"
+                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 :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="" />
+            <img
+              :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=""
+            />
           </div>
           <div class="rightContent">
             <div class="topContent">{{ item.name }}</div>
@@ -73,39 +115,54 @@
               {{ item.description }}
             </div>
           </div>
-          <a-button style="
+          <a-button
+            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 v-model:current="roomPage" v-model:pageSize="roomLimit" show-quick-jumper :total="roomTotal"
-          :page-size-options="pageSizeOptions" @change="onRoomChange" @showSizeChange="onShowSizeChange"
-          show-size-changer />
+        <a-pagination
+          v-model:current="roomPage"
+          v-model:pageSize="roomLimit"
+          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 :columns="columnsRomm" :data-source="dataRoom" :filterMultiple="false" :align="center"
-          :pagination="false">
+        <a-table
+          :columns="columnsRomm"
+          :data-source="dataRoom"
+          :filterMultiple="false"
+          :align="center"
+          :pagination="false"
+        >
           <template #bodyCell="{ column, record }">
             <template v-if="column.key === 'bookDate'">
               <span>
                 {{ record.bookDate }} {{ record.startTime }}-{{
-                record.endTime
+                  record.endTime
                 }}
               </span>
             </template>
             <template v-if="column.key === 'state'">
               <span>
                 {{
-                record.state == 2
-                ? '通过'
-                : record.state == 1
-                ? '审核中'
-                : '不通过'
+                  record.state == 2
+                    ? '通过'
+                    : record.state == 1
+                    ? '审核中'
+                    : '不通过'
                 }}
               </span>
             </template>
@@ -114,52 +171,69 @@
             </template>
           </template>
         </a-table>
-        <a-pagination v-model:current="roomPage" v-model:pageSize="roomLimit" show-quick-jumper :total="roomTotal"
-          :page-size-options="pageSizeOptionsChengguo" @change="onRoomChangeChengguo"
-          @showSizeChange="onShowSizeChangeChengguo" show-size-changer />
+        <a-pagination
+          v-model:current="roomPage"
+          v-model:pageSize="roomLimit"
+          show-quick-jumper
+          :total="roomTotal"
+          :page-size-options="pageSizeOptionsChengguo"
+          @change="onRoomChangeChengguo"
+          @showSizeChange="onShowSizeChangeChengguo"
+          show-size-changer
+        />
       </div>
-      <a-modal v-model:visible="visibleRoom" width="10rem" title="预约详情" :body-style="bodystyle" class="modalClass"
-        :footer="null">
+      <a-modal
+        v-model:visible="visibleRoom"
+        width="10rem"
+        title="预约详情"
+        :body-style="bodystyle"
+        class="modalClass"
+        :footer="null"
+      >
         <div class="modalResult" style="margin-bottom: 0.05rem">预约结果</div>
-        <div style="
+        <div
+          style="
             width: 100%;
             height: 0.01rem;
             border-top: 1px solid #ccc;
             transform: scaleY(0.5);
-          "></div>
-        <div class="modalExamine" style="display: flex; flex-direction: column; margin-top: 0.2rem">
+          "
+        ></div>
+        <div
+          class="modalExamine"
+          style="display: flex; flex-direction: column; margin-top: 0.2rem"
+        >
           <span style="margin-bottom: 0.2rem">
-            审核结果：{{
-            lookData.state == 2
-            ? '通过'
-            : lookData.state == 1
-            ? '审核中'
-            : '不通过'
-            }}
+            审核结果：{{ lookData.state === '2' ? '通过' : '不通过' }}
           </span>
           <span style="width: 8rem; margin-bottom: 0.3rem">
             审核意见：{{ lookData.auditViem }}
           </span>
         </div>
         <div class="modalYuyue" style="margin-bottom: 0.05rem">预约信息</div>
-        <div style="
+        <div
+          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
+              lookData.endTime
             }}
           </div>
-          <div class="modalContent" style="
+          <div
+            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>
@@ -169,18 +243,43 @@
           使用事项：{{ lookData.matter }}
         </div>
       </a-modal>
-      <a-modal v-model:visible="appointmentRoom" title="会议室预约" width="10rem" @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-modal
+        v-model:visible="appointmentRoom"
+        title="会议室预约"
+        width="10rem"
+        @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 name="bookDate" label="预约日期" v-bind="validateInfos.bookDate"
-                @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
+                name="bookDate"
+                label="预约日期"
+                v-bind="validateInfos.bookDate"
+                @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 :class="roomDateList[0] != null ? 'jinggaoD' : 'jinggaoNull'">
+              <div
+                :class="roomDateList[0] != null ? 'jinggaoD' : 'jinggaoNull'"
+              >
                 <div class="imgJinggao"></div>
                 <span style="color: #da2a13; font-size: 0.12rem">
                   当日会议室可用时段：{{ roomDateList[0] }}
@@ -188,47 +287,89 @@
               </div>
             </a-col>
             <a-col :span="8">
-              <a-form-item name="startTime" label="预约时段" v-bind="validateInfos.startTime" 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
+                name="startTime"
+                label="预约时段"
+                v-bind="validateInfos.startTime"
+                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 v-model:value="formState.endTime" placeholder="结束时间" value-format="HH:mm:ss"
-                :disabledHours="disabledTimeEndHours" :disabledMinutes="disabledTimeEndMinutes"
-                :disabledSeconds="disabledTimeEndSeconds" />
+              <a-time-picker
+                v-model:value="formState.endTime"
+                placeholder="结束时间"
+                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 name="name" label="预约人" v-bind="validateInfos.name">
+              <a-form-item
+                name="name"
+                label="预约人"
+                v-bind="validateInfos.name"
+              >
                 <a-input v-model:value="formState.name" style="width: 72%" />
               </a-form-item>
             </a-col>
             <a-col :span="8">
-              <a-form-item name="phone" label="联系电话" v-bind="validateInfos.phone">
+              <a-form-item
+                name="phone"
+                label="联系电话"
+                v-bind="validateInfos.phone"
+              >
                 <a-input v-model:value="formState.phone" style="width: 72%" />
               </a-form-item>
             </a-col>
             <a-col :span="8">
-              <a-form-item name="dept" label="预约部门" v-bind="validateInfos.dept">
+              <a-form-item
+                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 name="matter" v-bind="validateInfos.matter" label="使用事项" class="introduction">
+              <a-form-item
+                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 name="uploadRoom" label="附件上传" class="introduction">
-                <a-upload :max-count="1" accept=".doc,.docx,pdf" v-model:file-list="fileList"
-                  :action="`${apiURL}/upload`" @remove="handleRemove" @change="roomUpload">
+              <a-form-item
+                name="uploadRoom"
+                label="附件上传"
+                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>
@@ -239,9 +380,16 @@
               </a-form-item>
             </a-col>
           </a-row>
-          <a-form-item :wrapper-col="{ span: 14, offset: 4 }" style="text-align: center; margin-top: 0.4rem">
+          <a-form-item
+            :wrapper-col="{ span: 14, offset: 4 }"
+            style="text-align: center; margin-top: 0.4rem"
+          >
             <a-button @click="resetFields" type="primary" danger>取消</a-button>
-            <a-button style="margin-left: 10px" type="primary" @click="onSubmit">
+            <a-button
+              style="margin-left: 10px"
+              type="primary"
+              @click="onSubmit"
+            >
               提交
             </a-button>
           </a-form-item>
@@ -273,1178 +421,534 @@
         <div class="contentRight">
           <!-- 搜索@search="onSearch" -->
           <div class="searchInput" v-if="isXiHaiAn">
-            <a-input-search v-model:value="mapSearchParam.cameraName" placeholder="请输入关键词" 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-input-search
+              v-model:value="mapSearchParam.cameraName"
+              placeholder="请输入关键词"
+              enter-button="搜索"
+              size="large"
+              @change="getCamera"
+            />
+            <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 type="primary" @click="batchPreview" class="buttonAdd" v-if="isXiHaiAn">
+          <a-button
+            type="primary"
+            @click="batchPreview"
+            class="buttonAdd"
+            v-if="isXiHaiAn"
+          >
             批量预览
           </a-button>
           <!-- 批量预览 -->
-          <a-button type="primary" @click="batchPicturePreview" class="buttonAdd" v-else>
+          <a-button
+            type="primary"
+            @click="batchPicturePreview"
+            class="buttonAdd"
+            v-if="!cloudResourcesFlag"
+          >
             批量预览
           </a-button>
           <!-- 添加至申购车 -->
-          <a-button type="primary" @click="addShoppingCart" class="buttonAdd">
+          <a-button type="primary" @click="addShoppingCart" class="buttonAdd" v-if="!cloudResourcesFlag">
             添加至申购车
           </a-button>
           <!-- 一键申请 -->
-          <a-button type="primary" @click="apply" class="buttonAdd">
+          <a-button type="primary" @click="apply" class="buttonAdd" v-if="!cloudResourcesFlag">
             一键申请
           </a-button>
+           <!-- 申请政务云资源 -->
+          <a-button type="primary" @click="applyCloudResources" class="buttonAdd"  v-if="cloudResourcesFlag">
+           我要申请政务云资源
+          </a-button>
         </div>
       </div>
       <!-- 表格 -->
       <div class="infrastructrue-table" v-if="!wrjFlag">
-        <a-table class="ant-table-striped" :dataSource="dataSource" :columns="columns" :scroll="{ y: tableHeight }"
-          rowKey="channelId" :rowClassName="
+        <a-table
+          class="ant-table-striped"
+          :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,
             // onChange: onSelectChange,
             onSelect: onSelectChange,
             onSelectAll: onSelectAll,
-          }">
+          }"
+        >
           <template #bodyCell="{ column, record }">
             <template v-if="column.dataIndex === 'operation'">
-              <a v-if="isXiHaiAn" @click="
-                openVideo(
-                  record.channelCode ||
-                    record.channelId ||
-                    record.channelCode.channelId
-                )
-              ">
+              <a
+                v-if="isXiHaiAn"
+                @click="
+                  openVideo(
+                    record.channelCode ||
+                      record.channelId ||
+                      record.channelCode.channelId
+                  )
+                "
+              >
                 预览
               </a>
-              <a v-else @click="
-                openPicture(
-                  record.channelCode ||
-                    record.channelId ||
-                    record.channelCode.channelId
-                )
-              ">
+              <a
+                v-else
+                @click="
+                  openPicture(
+                    record.channelCode ||
+                      record.channelId ||
+                      record.channelCode.channelId
+                  )
+                "
+              >
                 预览
               </a>
             </template>
           </template>
         </a-table>
       </div>
-      <!-- 西海岸-无人机、单兵设备 -->
       <div class="infrastructrue-table" v-else-if="isXiHaiAn && wrjFlag">
-        <a-table class="ant-table-striped" :dataSource="dataSource2" :columns="columns2" :scroll="{ y: tableHeight }"
-          rowKey="channelId" :rowClassName="
+        <a-table
+          class="ant-table-striped"
+          :dataSource="dataSource2"
+          :columns="columns2"
+          :scroll="{ y: tableHeight }"
+          rowKey="channelId"
+          :rowClassName="
             (record, index) => (index % 2 === 1 ? 'table-striped' : null)
-          " :pagination="pagination" @change="handleTableChange">
+          "
+          :pagination="dataSource2.length"
+        >
           <template #bodyCell="{ column, record }">
             <template v-if="column.dataIndex === 'operation'">
-              <a-button @click="goToApply(record)" type="link" :disabled="record.state != 1">
+              <a
+                @click="goToWrj(record)"
+                style="margin-right: 10px"
+                v-if="record.type !== '单兵设备'"
+              >
+                控制台
+              </a>
+              <a @click="goToApply(record)" style="margin-right: 10px" v-else>
                 申请
-              </a-button>
-              <a-button @click="showWrj(record)" type="link">
-                详情
-              </a-button>
+              </a>
+              <a @click="showWrj(record)">详情</a>
             </template>
           </template>
         </a-table>
       </div>
       <!-- 单个预览弹窗 -->
-      <a-modal wrapClassName="single-preview-modal" v-model:visible="visible" title="视频预览" :width="960" destroyOnClose>
+      <a-modal
+        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 style="width: 100%; height: 100%;position:relative">
-            <!-- 预览视频--遮罩 -->
-            <div class="video-cover" @click="videoShowMsg"></div>
+          <div style="width: 100%; height: 100%">
             <vue3VideoPlay v-bind="options" />
           </div>
         </div>
       </a-modal>
-
       <!-- 图片预览 -->
-      <a-modal wrapClassName="single-preview-modal" v-model:visible="picVisible" title="图片预览" :width="960"
-        destroyOnClose>
+      <a-modal
+        wrapClassName="single-preview-modal"
+        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 wrapClassName="batch-preview-modal" v-model:visible="batchPicVisible" title="图片批量预览" :width="1060"
-        destroyOnClose @cancel="videoClean">
+      <a-modal
+        wrapClassName="batch-preview-modal"
+        v-model:visible="batchPicVisible"
+        title="图片批量预览"
+        :width="1060"
+        destroyOnClose
+        @cancel="videoClean"
+      >
         <template #footer></template>
         <div class="batch-video">
-          <div v-for="item in videoList" :key="item.id" 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
+            v-for="item in videoList"
+            :key="item.id"
+            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 v-model:current="current" :total="videoTotal" defaultPageSize="4" :showSizeChanger="false"
-          @change="batchPicturePreview" show-less-items />
+        <a-pagination
+          v-model:current="current"
+          :total="videoTotal"
+          defaultPageSize="4"
+          :showSizeChanger="false"
+          @change="batchPicturePreview"
+          show-less-items
+        />
       </a-modal>
       <!-- 批量预览视频弹窗 -->
-      <a-modal wrapClassName="batch-preview-modal" v-model:visible="batchVisible" title="视频批量预览" :width="1060"
-        destroyOnClose @cancel="videoClean">
+      <a-modal
+        wrapClassName="batch-preview-modal"
+        v-model:visible="batchVisible"
+        title="视频批量预览"
+        :width="1060"
+        destroyOnClose
+        @cancel="videoClean"
+      >
         <template #footer></template>
         <div class="batch-video">
-          <div v-for="item in videoList" :key="item.id" style="width: 100%; height: 100%;position:relative">
-            <!-- 批量预览视频--遮罩 -->
-            <div class="batch-video-cover" @click="videoShowMsg"></div>
+          <div
+            v-for="item in videoList"
+            :key="item.id"
+            style="width: 100%; height: 100%"
+          >
             <p></p>
             <vue3VideoPlay v-bind="item.options" />
           </div>
         </div>
-        <a-pagination v-model:current="current" :total="videoTotal" defaultPageSize="4" :showSizeChanger="false"
-          @change="batchPreview" show-less-items />
+        <a-pagination
+          v-model:current="current"
+          :total="videoTotal"
+          defaultPageSize="4"
+          :showSizeChanger="false"
+          @change="batchPreview"
+          show-less-items
+        />
       </a-modal>
-      <a-modal wrapClassName="wrj" v-model:visible="wrjVisible" :width="1000" :title="wrjName + '详情'"
-        @ok="wrjVisible = false">
-        <div v-for="(db, key) in wrjData" :key="key">
-          <template v-if="typeof db == 'object'">
-            <div style="
+      <a-modal
+        wrapClassName="wrj"
+        v-model:visible="wrjVisible"
+        :width="1000"
+        :title="wrjName + '详情'"
+        @ok="wrjVisible = false"
+      >
+        <template v-if="dataSource2[0].type !== '单兵设备'">
+          <div v-for="wrj in wrjData" :key="wrj.name">
+            <div
+              style="
+                font-size: 20px;
+                font-weight: 600;
+                margin: 10px 0;
+                text-align: center;
+              "
+            >
+              {{ wrj.name }}
+            </div>
+            <div
+              style="padding: 0 30px"
+              v-for="(value, key) in wrj.attribute"
+              :key="value"
+            >
+              {{ key + '：' + value }}
+            </div>
+          </div>
+        </template>
+        <template v-else>
+          <div v-for="(db, key) in wrjData" :key="key">
+            <template v-if="typeof db == 'object'">
+              <div
+                style="
                   font-size: 20px;
                   font-weight: 600;
                   margin: 10px 0;
                   text-align: center;
-                ">
-              {{ db.attrType || '--' }}
-            </div>
-            <template v-if="db.attrValue">
-              <div style="padding: 0 30px" v-for="(value, key2) in JSON.parse(db.attrValue)" :key="value">
+                "
+              >
+                {{ key }}
+              </div>
+              <div
+                style="padding: 0 30px"
+                v-for="(value, key2) in db"
+                :key="value"
+              >
                 {{ key2 + '：' + value }}
               </div>
             </template>
-          </template>
-        </div>
+            <template v-else>
+              <div style="padding: 0 30px">
+                {{ key + '：' + db }}
+              </div>
+            </template>
+          </div>
+        </template>
       </a-modal>
     </div>
   </div>
 </template>
 <script setup>
-import VideoSurveillance from '@/views/home/videoSurveillance'
-import { useRouter } from 'vue-router'
-import { message, Upload } from 'ant-design-vue'
-import {
-  ref,
-  reactive,
-  onMounted,
-  defineProps,
-  watch,
-  defineComponent,
-  nextTick,
-  defineExpose,
-  computed,
+  import VideoSurveillance from '@/views/home/videoSurveillance'
+  // import { getCategoryTreePage } from '@/api/personalCenter'
+  // import { dataType } from 'element-plus/es/components/table-v2/src/common'
+  import { useRouter } from 'vue-router'
+  import { message, Upload } from 'ant-design-vue'
+  import {
+    ref,
+    reactive,
+    onMounted,
+    defineProps,
+    watch,
+    defineComponent,
+    nextTick,
+    defineExpose,
+  } from 'vue'
+  import {
+    getCameraByParentId,
+    getStreamByChannelCode,
+    getCameraAllLabel,
+    selectByChannelCode,
+  } from '@/api/videoSurveillance'
+  import { getCameraByCondition } from '@/api/file'
+  import {
+    sgcInsert,
+    getRoomSearch,
+    getDate,
+    setSubmit,
+    getYuyue,
+  } from '@/api/home'
+  import mybus from '@/myplugins/mybus'
+  import dayjs from 'dayjs'
+  import { Form } from 'ant-design-vue'
+  import moment from 'moment'
+  const props = defineProps({
+    // 模糊查
+    searchValue: { type: String, default: '' },
+  })
+  const current = ref(1)
+  const videoTotal = ref(0)
+  const router = useRouter()
+  const whoShow1 = ref(whoShow)
+  const isXiHaiAn = whoShow1.value.itShowXiHaiAn
+  const options = reactive({
+    width: '912px', //播放器宽度
+    height: '513px', //播放器高度
+    color: '#409eff', //主题色
+    title: '', //视频名称
+    src: '', //视频源
+    type: 'm3u8', // 视频源类型
+    muted: false, //静音
+    webFullScreen: false,
+    speedRate: ['0.75', '1.0', '1.25', '1.5', '2.0'], //播放倍速
+    autoPlay: isXiHaiAn, //自动播放
+    loop: false, //循环播放
+    mirror: false, //镜像画面
+    ligthOff: false, //关灯模式
+    volume: 0.3, //默认音量大小
+    control: true, //是否显示控制
+    controlBtns: [
+      'audioTrack',
+      'quality',
+      'speedRate',
+      'volume',
+      'setting',
+      'pip',
+      'pageFullScreen',
+      'fullScreen',
+    ], //显示所有按钮,
+  })
+  const videoList = ref([])
+  let visible = ref(false) // 视频预览
+  let picVisible = ref(false) // 图片预览
+  let batchVisible = ref(false) // 视频批量预览
+  let batchPicVisible = ref(false) // 图片批量预览
+  const jcssType = ref(router.currentRoute.value.query.type)
+  const pagination = ref({
+    total: 0,
+    current: 1,
+    pageSize: 10, //每页中显示10条数据
+    showSizeChanger: true,
+    pageSizeOptions: ['10', '30', '50', '100', '1000'], //每页中显示的数据
+  })
+  //会议室变量区域=======
+  const paginationRoom = ref({
+    total: 0,
+    current: 1,
+    pageSize: 10, //每页中显示10条数据
+    showSizeChanger: true,
+    pageSizeOptions: ['5', '10', '15', '20'], //每页中显示的数据
+  })
+  const formState = reactive({
+    // name: '',
+    // iphone: '18264084961',
+    // group: '',
+    // create: '',
+    // cerateTime: '',
+    // endTime: '',
+    // introduction: '',
+    // uploadRoom: '',
+    roomId: '',
+    bookDate: '', //日期
+    startTime: '', //开始时间
+    endTime: '', //结束时间
+    name: '',
+    phone: '',
+    dept: '',
+    matter: '',
+    file: '',
+  })
+  const fileList = ref([])
+  const useForm = Form.useForm
+  const roomInput = ref('')
+  const rulesRef = reactive({
+    bookDate: [
+      {
+        type: 'string',
+        required: true,
+        message: '请选择日期',
+      },
+    ],
+    startTime: [
+      {
+        type: 'string',
+        required: true,
+        message: '请选择时间段',
+      },
+    ],
+    name: [
+      {
+        required: true,
+        message: '请输入预约人',
+      },
+    ],
+    matter: [{ min: 1, max: 500, required: true, message: '可输入500字内容' }],
+    phone: [
+      {
+        required: true,
+        pattern: /^1[3|4|5|7|8][0-9]\d{8}$/,
+        message: '请输入正确的手机号',
+      },
+    ],
+    dept: [
+      {
+        required: true,
+        message: '请输入部门',
+      },
+    ],
+  })
+  const { resetFields, validateInfos, validate } = useForm(formState, rulesRef)
+  const mapSearchParam = ref({
+    // 地图搜索初始化数据
+    parentId: '',
+    cameraName: '',
+    checkStatus: '1',
+    pageNum: pagination.value.current,
+    pageSize: pagination.value.pageSize,
+    gpsX: '',
+    gpsY: '',
+    radius: '',
+    labelCodes: [],
+  })
+  const showMap = ref(true)
+  const room = ref(true)
+  const roomResult = ref(true)
+  const roomYuyue = ref(true)
+  const visibleRoom = ref(false)
+  const appointmentRoom = ref(false)
+  const labelPosition = ref('left')
+  const apiURL = window.SITE_CONFIG.apiURL
+  const roomList = ref([])
+  const roomPage = ref(1)
+  const roomLimit = ref(5)
+  const roomTotal = ref(0)
+  const pageSizeOptions = ref(['5', '10', '20', '50'])
+  const pageSizeOptionsChengguo = ref(['5', '10', '20', '50'])
+  const dateId = ref(null)
+  const roomDateList = ref([])
+  //开始时间---结束时间
+  const roomCerateDate = ref('')
+  const roomCreateTime = ref('')
+  const roomEndTime = ref('')
+  const roomModalCreateTime = ref('')
+  const roomModalEndTime = ref('')
+  const lookData = ref({})
 
-} from 'vue'
-import {
-  getCameraByParentId,
-  getStreamByChannelCode,
-  getCameraAllLabel,
-  selectByChannelCode,
-} from '@/api/videoSurveillance'
-import { getCameraByCondition } from '@/api/file'
-import {
-  sgcInsert,
-  getRoomSearch,
-  getDate,
-  setSubmit,
-  getYuyue,
-  getSoldierList,
-} from '@/api/home'
-import mybus from '@/myplugins/mybus'
-import dayjs from 'dayjs'
-import { Form } from 'ant-design-vue'
-import moment from 'moment'
-const props = defineProps({
-  // 模糊查
-  searchValue: { type: String, default: '' },
-})
-const current = ref(1)
-const videoTotal = ref(0)
-const router = useRouter()
-const whoShow1 = ref(whoShow)
-const isXiHaiAn = whoShow1.value.itShowXiHaiAn;
-const options = reactive({
-  width: '912px', //播放器宽度
-  height: '513px', //播放器高度
-  color: '#409eff', //主题色
-  title: '', //视频名称
-  src: '', //视频源
-  type: 'm3u8', // 视频源类型
-  muted: false, //静音
-  webFullScreen: false,
-  speedRate: ['0.75', '1.0', '1.25', '1.5', '2.0'], //播放倍速
-  autoPlay: isXiHaiAn ? false : true, //自动播放
-  loop: false, //循环播放
-  mirror: false, //镜像画面
-  ligthOff: false, //关灯模式
-  volume: 0.3, //默认音量大小
-  control: isXiHaiAn ? false : true, //是否显示控制
-  controlBtns: isXiHaiAn ? [] : [
-    'audioTrack',
-    'quality',
-    'speedRate',
-    'volume',
-    'setting',
-    'pip',
-    'pageFullScreen',
-    'fullScreen',
-  ], //显示所有按钮,
-})
-const videoList = ref([])
-let visible = ref(false) // 视频预览
-let picVisible = ref(false) // 图片预览
-let batchVisible = ref(false) // 视频批量预览
-let batchPicVisible = ref(false) // 图片批量预览
-const jcssType = ref(router.currentRoute.value.query.type)
-const pagination = ref({
-  total: 0,
-  current: 1,
-  pageSize: 10, //每页中显示10条数据
-  showSizeChanger: true,
-  pageSizeOptions: ['10', '30', '50', '100', '1000'], //每页中显示的数据
-})
-//会议室变量区域=======
-const paginationRoom = ref({
-  total: 0,
-  current: 1,
-  pageSize: 10, //每页中显示10条数据
-  showSizeChanger: true,
-  pageSizeOptions: ['5', '10', '15', '20'], //每页中显示的数据
-})
-const formState = reactive({
-  roomId: '',
-  bookDate: '', //日期
-  startTime: '', //开始时间
-  endTime: '', //结束时间
-  name: '',
-  phone: '',
-  dept: '',
-  matter: '',
-  file: '',
-  roomName: '',
-})
-const fileList = ref([])
-const useForm = Form.useForm
-const roomInput = ref('')
-const rulesRef = reactive({
-  bookDate: [
-    {
-      type: 'string',
-      required: true,
-      message: '请选择日期',
-    },
-  ],
-  startTime: [
-    {
-      type: 'string',
-      required: true,
-      message: '请选择时间段',
-    },
-  ],
-  name: [
-    {
-      required: true,
-      message: '请输入预约人',
-    },
-  ],
-  matter: [{ min: 1, max: 500, required: true, message: '可输入500字内容' }],
-  phone: [
-    {
-      required: true,
-      pattern: /^1[3|4|5|7|8|9][0-9]\d{8}$/,
-      message: '请输入正确的手机号',
-    },
-  ],
-  dept: [
-    {
-      required: true,
-      message: '请输入部门',
-    },
-  ],
-})
-const { resetFields, validateInfos, validate } = useForm(formState, rulesRef)
-const mapSearchParam = ref({
-  // 地图搜索初始化数据
-  parentId: '',
-  cameraName: '',
-  checkStatus: '1',
-  pageNum: pagination.value.current,
-  pageSize: pagination.value.pageSize,
-  gpsX: '',
-  gpsY: '',
-  radius: '',
-  labelCodes: [],
-})
-const showMap = ref(true)
-const room = ref(true)
-const roomResult = ref(true)
-const roomYuyue = ref(true)
-const visibleRoom = ref(false)
-const appointmentRoom = ref(false)
-const labelPosition = ref('left')
-const apiURL = window.SITE_CONFIG.apiURL
-const roomList = ref([])
-const roomPage = ref(1)
-const roomLimit = ref(5)
-const roomTotal = ref(0)
-const pageSizeOptions = ref(['5', '10', '20', '50'])
-const pageSizeOptionsChengguo = ref(['5', '10', '20', '50'])
-const dateId = ref(null)
-const roomDateList = ref([])
-//开始时间---结束时间
-const roomCerateDate = ref('')
-const roomCreateTime = ref('')
-const roomEndTime = ref('')
-const roomModalCreateTime = ref('')
-const roomModalEndTime = ref('')
-const lookData = ref({})
-
-// console.log('模糊查传递', props.searchValue)
-if (props.searchValue) {
-  mapSearchParam.value.cameraName = props.searchValue
-}
-onMounted(() => {
-  if (jcssType.value) {
-    tabClick(0, jcssType.value)
-    if (jcssType.value == '视频资源') {
+  // console.log('模糊查传递', props.searchValue)
+  if (props.searchValue) {
+    // console.log('模糊查传递')
+    // eslint-disable-next-line vue/no-setup-props-destructure
+    mapSearchParam.value.cameraName = props.searchValue
+  }
+  //===========================
+  onMounted(() => {
+    if (jcssType.value) {
+      tabClick(0, jcssType.value)
+      if (jcssType.value == '视频资源') {
+        getCamera()
+      }
+    } else {
+      tabClick(0, '政务云资源')
       getCamera()
     }
-  } else {
-    tabClick(0, '视频资源')
-    getCamera()
-  }
 
-  mybus.off('getListByParentId')
-  mybus.on('getListByParentId', (parentId) => {
-    mapSearchParam.value.parentId = parentId
-    getCamera()
+    mybus.off('getListByParentId')
+    mybus.on('getListByParentId', (parentId) => {
+      mapSearchParam.value.parentId = parentId
+      getCamera()
+    })
+    mybus.off('getListByMap')
+    mybus.on('getListByMap', (param) => {
+      mapSearchParam.value.gpsX = param.gpsX
+      mapSearchParam.value.gpsY = param.gpsY
+      mapSearchParam.value.radius = param.radius
+      getCamera()
+    })
   })
-  mybus.off('getListByMap')
-  mybus.on('getListByMap', (param) => {
-    mapSearchParam.value.gpsX = param.gpsX
-    mapSearchParam.value.gpsY = param.gpsY
-    mapSearchParam.value.radius = param.radius
-    getCamera()
-  })
-})
-const selectedList = ref([])
-const selectedRowKeys = ref([])
-const tabList = ref([
-  {
-    title: '设施类型',
-    content: isXiHaiAn ? ['视频资源'] : ['视频资源', '云资源', '感知资源', '城市云脑会客厅'],
-  },
-])
-if (!isXiHaiAn) {
-  tabList.value.push({
-    title: '视频标签',
-    content: [],
-  })
-}
-const wrjVisible = ref(false)
-const wrjName = ref('')
-const wrjData = ref([])
-
-// 单兵、无人机-详情
-const showWrj = (data) => {
-  wrjName.value = data.wrjName
-  wrjData.value = data.deviceAttrDTOList || []
-  wrjVisible.value = true
-}
-const goToWrj = (data) => {
-  window.open(data.url)
-}
-
-// 西海岸-无人机、单兵设备申请
-const goToApply = (data) => {
-  console.log(data, dept)
-  let arr = [
+  const selectedList = ref([])
+  const selectedRowKeys = ref([])
+  const tabList = ref([
     {
-      arr: [
-        {
-          // description:
-          //   '申请单兵手持便携终端，提告前端人员执法透明度，加强执法人员与指挥中心实时沟通。',
-          // resourceId: 'dbsb',
-          // type: '单兵设备',
-          description: data.description,
-          resourceId: data.id,
-          resourceName: data.wrjName,
-          type: data.type,
-        },
-      ],
-      deptId: dept.deptId || data.deptId || '',
-      deptName: dept.deptName,
+      title: '设施类型',
+      content: ['政务云资源','视频资源', '感知资源', '城市云脑会客厅'],
     },
-  ]
-  localStorage.setItem('applyList', JSON.stringify(arr))
-  router.push({
-    path: '/apply',
-  })
-}
-if (whoShow1.value.itShowXiHaiAn) {
-  tabList.value[0].content.push('无人机')
-  tabList.value[0].content.push('单兵设备')
-}
-// 打开视频预览
-const openVideo = (id) => {
-  console.log('打开视频', id)
-  const param = {
-    key: id,
-  }
-  getStreamByChannelCode(param).then((res) => {
-    console.log(res)
-    visible.value = true
-    options.src = res.data.data
-  })
-  // // 视频测试--勿删
-  // visible.value = true
-  // options.src = 'http://playertest.longtailvideo.com/adaptive/bipbop/gear4/prog_index.m3u8'
-}
-// 打开图片预览
-const openPicture = (id) => {
-  console.log('打开图片', id)
-  const param = {
-    channelCode: id,
-  }
-  selectByChannelCode(param).then((res) => {
-    console.log(res)
-    if (res.data.data && res.data.data[0].picUrl) {
-      options.src = res.data.data[0].picUrl
-      picVisible.value = true
-    } else {
-      message.warning('该点位暂无预览图片！')
-    }
-  })
-}
-
-//初始化数据
-const init = () => {
-  tabList.value.map((item) => {
-    let params = {
-      title: item.title,
+    {
+      title: '视频标签',
       content: [],
-    }
-    clickList.value.push(params)
-  })
-  mybus.off('tranferToList')
-  mybus.on('tranferToList', () => {
-    console.log('获取到的列表数据')
-  })
-}
-let clickList = ref([]) //存储点击的tab
-init()
-//点击会议室左侧切换
-const result = () => {
-  roomYuyue.value = false
-  roomResult.value = true
-  chengguoSearch()
-}
-const chengguoSearch = () => {
-  let query = {
-    page: roomPage.value,
-    limit: roomLimit.value,
-    roomName: roomInput.value,
+    },
+  ])
+  const wrjVisible = ref(false)
+  const wrjName = ref('')
+  const wrjData = ref([])
+  const showWrj = (data) => {
+    wrjName.value = data.wrjName
+    wrjData.value = data.details
+    wrjVisible.value = true
   }
-  getYuyue(query).then(({ data: res }) => {
-    dataRoom.value = res.data.list
-    roomTotal.value = res.data.total
-  })
-}
-const roomResults = () => {
-  roomYuyue.value = true
-  roomResult.value = false
-}
-// 查看详情
-const look = (row) => {
-  visibleRoom.value = true
-  lookData.value = row
-}
-//   搜索
-const onSearch = (searchValue) => {
-  searchData()
-  chengguoSearch()
-}
-//重置
-const reSetSearch = () => {
-  roomInput.value = ''
-  searchData()
-  chengguoSearch()
-}
-// 时间选择器限制----可用时间查询
-//获取不可选择的小时
-const disabledStartHours = () => {
-  if (roomEndTime.value) {
-    let hours = []
-    let hour = roomEndTime.value.substr(0, 2)
-    for (let i = hour; i < 24; i++) {
-      hours.push(i)
-    }
-    return hours
+  const goToWrj = (data) => {
+    window.open(data.url)
   }
-}
-//获取不可选择的分钟
-const disabledStartMinutes = (selectedHour) => {
-  if (roomEndTime.value) {
-    let minutes = []
-    let hour = roomEndTime.value.substr(0, 2)
-    let minute = roomEndTime.value.substr(3, 2)
-    if (selectedHour == hour) {
-      for (let i = minute; i < 60; i++) {
-        minutes.push(i)
-      }
-    }
-    return minutes
-  }
-}
-//获取不可选择的秒
-const disabledStartSeconds = (selectedHour, selectedMinute) => {
-  if (roomEndTime.value) {
-    let seconds = []
-    let hour = roomEndTime.value.substr(0, 2)
-    let minute = roomEndTime.value.substr(3, 2)
-    let second = roomEndTime.value.substr(6, 2)
-    if (selectedHour == hour && selectedMinute.value == minute) {
-      for (let i = second - 1; i < 60; i++) {
-        seconds.push(i)
-      }
-    }
-    return seconds
-  }
-}
-//获取不可选择的小时
-const disabledEndHours = () => {
-  if (roomCreateTime.value) {
-    let hours = []
-    let hour = roomCreateTime.value.substr(0, 2)
-    for (let i = 0; i < hour; i++) {
-      hours.push(i)
-    }
-    return hours
-  }
-}
-//获取不可选择的分钟
-const disabledEndMinutes = (selectedHour) => {
-  if (roomCreateTime.value) {
-    let minutes = []
-    let hour = roomCreateTime.value.substr(0, 2)
-    let minute = roomCreateTime.value.substr(3, 2)
-    if (selectedHour == hour) {
-      for (let i = 0; i < minute; i++) {
-        minutes.push(i)
-      }
-    }
-    return minutes
-  }
-}
-//获取不可选择的秒
-const disabledEndSeconds = (selectedHour, selectedMinute) => {
-  if (roomCreateTime.value) {
-    let seconds = []
-    let hour = roomCreateTime.value.substr(0, 2)
-    let minute = roomCreateTime.value.substr(3, 2)
-    let second = roomCreateTime.value.substr(6, 2)
-    if (selectedHour == hour && selectedMinute.value == minute) {
-      for (let i = 0; i <= second; i++) {
-        seconds.push(i)
-      }
-    }
-    return seconds
-  }
-}
-// 时间选择器限制----会议室预约时段
-//获取不可选择的小时
-const disabledTimeHours = () => {
-  if (formState.endTime) {
-    let hours = []
-    let hour = formState.endTime.substr(0, 2)
-    for (let i = hour; i < 24; i++) {
-      hours.push(i)
-    }
-    return hours
-  }
-}
-//获取不可选择的分钟
-const disabledTimeMinutes = (selectedHour) => {
-  if (formState.endTime) {
-    let minutes = []
-    let hour = formState.endTime.substr(0, 2)
-    let minute = formState.endTime.substr(3, 2)
-    if (selectedHour == hour) {
-      for (let i = minute; i < 60; i++) {
-        minutes.push(i)
-      }
-    }
-    return minutes
-  }
-}
-//获取不可选择的秒
-const disabledTimeSeconds = (selectedHour, selectedMinute) => {
-  if (formState.endTime) {
-    let seconds = []
-    let hour = formState.endTime.substr(0, 2)
-    let minute = formState.endTime.substr(3, 2)
-    let second = formState.endTime.substr(6, 2)
-    if (selectedHour == hour && selectedMinute.value == minute) {
-      for (let i = second - 1; i < 60; i++) {
-        seconds.push(i)
-      }
-    }
-    return seconds
-  }
-}
-//获取不可选择的小时
-const disabledTimeEndHours = () => {
-  if (formState.startTime) {
-    let hours = []
-    let hour = formState.startTime.substr(0, 2)
-    for (let i = 0; i < hour; i++) {
-      hours.push(i)
-    }
-    return hours
-  }
-}
-//获取不可选择的分钟
-const disabledTimeEndMinutes = (selectedHour) => {
-  if (formState.startTime) {
-    let minutes = []
-    let hour = formState.startTime.substr(0, 2)
-    let minute = formState.startTime.substr(3, 2)
-    if (selectedHour == hour) {
-      for (let i = 0; i < minute; i++) {
-        minutes.push(i)
-      }
-    }
-    return minutes
-  }
-}
-//获取不可选择的秒
-const disabledTimeEndSeconds = (selectedHour, selectedMinute) => {
-  if (formState.startTime) {
-    let seconds = []
-    let hour = formState.startTime.substr(0, 2)
-    let minute = formState.startTime.substr(3, 2)
-    let second = formState.startTime.substr(6, 2)
-    if (selectedHour == hour && selectedMinute.value == minute) {
-      for (let i = 0; i <= second; i++) {
-        seconds.push(i)
-      }
-    }
-    return seconds
-  }
-}
-//分页
-const onRoomChange = (pageNumber) => {
-  roomPage.value = pageNumber
-  searchData()
-}
-const onShowSizeChange = (current, pageSize) => {
-  roomLimit.value = pageSize
-  searchData()
-}
-const onRoomChangeChengguo = (pageNumber) => {
-  roomPage.value = pageNumber
-  chengguoSearch()
-}
-const onShowSizeChangeChengguo = (current, pageSize) => {
-  roomLimit.value = pageSize
-  chengguoSearch()
-}
-//预约
-const appointment = (item) => {
-  dateId.value = item.id
-  formState.roomId = item.id
-  formState.roomName = item.name
-  appointmentRoom.value = true
-}
-//预约弹框 选择日期
-const handleChange = (i) => {
-  let query = {
-    date: i, //查询的riqi
-    roomId: dateId.value, //会议室主键
-  }
-  getDate(query).then(({ data: res }) => {
-    roomDateList.value = res.data
-  })
-}
-
-const columnsRomm = [
-  {
-    title: '会议室名称',
-    dataIndex: 'roomName',
-    align: 'center',
-  },
-  {
-    title: '预约时段',
-    key: 'bookDate',
-    align: 'center',
-  },
-  {
-    title: '预约状态',
-    key: 'state',
-    align: 'center',
-  },
-  {
-    title: '预约详情',
-    key: 'action',
-    align: 'center',
-  },
-]
-const dataRoom = ref([])
-const bodystyle = {
-  paddingTop: 0,
-  borderBottom: 0,
-}
-const handleOk = (e) => {
-  console.log(e)
-}
-//文件上传成功回调
-const roomUpload = (response) => {
-  if (response.file.response !== undefined) {
-    fileList.value = response.fileList
-    formState.file = response.file.response.data
-  }
-}
-//提交预约
-const onSubmit = () => {
-  validate()
-    .then(() => {
-      setSubmit(formState).then(({ data: res }) => {
-        appointmentRoom.value = false
-        rulesRef.bookDate = []
-        rulesRef.startTime = []
-        rulesRef.name = []
-        rulesRef.matter = []
-        rulesRef.phone = []
-        rulesRef.dept = []
-        formState.roomId = ''
-        formState.bookDate = ''
-        formState.startTime = '' //开始时间
-        formState.endTime = '' //结束时间
-        formState.name = ''
-        formState.phone = ''
-        formState.dept = ''
-        formState.matter = ''
-        formState.file = ''
-        fileList.value = []
-        searchData()
-      })
-    })
-    .catch((err) => {
-      console.log('error', err)
-    })
-}
-//会议室查询接口
-const searchData = () => {
-  let query = {
-    bookDate: roomCerateDate.value, //	预约开始时间 年月日
-    startTime: roomCreateTime.value, //预约开始时 间时分秒
-    endTime: roomEndTime.value, //	预约结束时间
-    name: roomInput.value, //会议室名称
-    page: roomPage.value, //页码
-    limit: roomLimit.value, //每页条数
-  }
-  getRoomSearch(query).then(({ data: res }) => {
-    roomList.value = res.data.list
-    roomTotal.value = res.data.total
-  })
-}
-const emits = defineEmits(['add'])
-//表格的高度
-let tableHeight = ref('600')
-//tab切换点击事件
-const tabClick = (indexFather, name) => {
-  console.log(
-    '点击tab================>',
-    indexFather,
-    name,
-    clickList.value[indexFather]
-  )
-  selectedRowKeys.value = []
-  selectedList.value = []
-  if (clickList.value[indexFather].content.indexOf(name) != -1) {
-    if (name == '视频资源') {
-      room.value = true
-      tableHeight.value = 330
-      showMap.value = true
-      if (tabList.value[1]) {
-        tabList.value[1].title = '视频标签'
-      }
-
-    } else if (name == '云资源') {
-      room.value = true
-      tableHeight.value = 600
-      showMap.value = false
-      dataSource.value = []
-      dataSource2.value = []
-      pagination.value.total = 0
-      if (tabList.value[1]) {
-        tabList.value[1].title = '云资源分类'
-      }
-    } else if (name == '感知资源') {
-      room.value = true
-      tableHeight.value = 330
-      showMap.value = true
-      dataSource.value = []
-      dataSource2.value = []
-      pagination.value.total = 0
-    } else if (name == '城市云脑会客厅') {
-      //     room.value = false
-      //     wrjFlag.value = true
-      //     showMap.value = false
-      // roomYuyue.value = true
-      //     roomResult.value = false
-      //     tabList.value[1] = []
-      //     emits('add', 6)
-      //     searchData()
-    }
-    clickList.value[indexFather].content.splice(
-      clickList.value[indexFather].content.indexOf(name),
-      1
-    )
-  } else {
-    if (name == '视频资源') {
-      wrjFlag.value = false
-      tableHeight.value = 330
-      showMap.value = true
-      if (tabList.value[1]) {
-        tabList.value[1].content = []
-        tabList.value[1].title = '视频标签'
-      }
-      if (clickList.value[1]) {
-        clickList.value[1].content = []
-      }
-      clickList.value[indexFather].content[0] = name
-      dataSource.value = []
-      dataSource2.value = []
-      room.value = true
-      getCameraAllLabel().then((res) => {
-        res.data.data.forEach((val) => {
-          if (tabList.value[1]) {
-            tabList.value[1].content.push({
-              labelCode: val.labelCode,
-              labelName: val.labelName,
-            })
-          }
-        })
-      })
-      // 改变查询摄像头接口的labelCode数组
-      mapSearchParam.value.labelCodes = []
-      if (clickList.value[1]) {
-        clickList.value[1].content.map((item) => {
-          mapSearchParam.value.labelCodes.push(item.labelCode)
-        })
-      }
-      console.log('选中的标签code', mapSearchParam.value)
-      mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + ''
-      emits('add', 1)
-      getCamera()
-    } else if (name == '云资源') {
-      tableHeight.value = 600
-      showMap.value = false
-      dataSource.value = []
-      dataSource2.value = []
-      pagination.value.total = 0
-      if (clickList.value[1]) {
-        clickList.value[1].content = []
-      }
-      clickList.value[indexFather].content[0] = name
-      if (tabList.value[1]) {
-        tabList.value[1].title = '云资源分类'
-        tabList.value[1].content = [
-          '云主机',
-          '算力主机',
-          '对象存储',
-          '堡垒机',
-          '防火墙',
-          '网闸',
-          '负载均衡',
-          '公网IP',
-        ]
-      }
-      room.value = true
-      wrjFlag.value = false
-      emits('add', 2)
-    } else if (name == '感知资源') {
-      tableHeight.value = 330
-      showMap.value = true
-      if (clickList.value[1]) {
-        clickList.value[1].content = []
-      }
-      pagination.value.total = 0
-      clickList.value[indexFather].content[0] = name
-      if (tabList.value[1]) {
-        tabList.value[1].content = []
-        tabList.value[1].title = '感知资源分类'
-      }
-      dataSource.value = []
-      dataSource2.value = []
-      room.value = true
-      wrjFlag.value = false
-      emits('add', 3)
-    } else if (name == '无人机') {
-      pagination.value.current = 1;
-      getSoldierData(indexFather, name)
-    } else if (name == '单兵设备') {
-      pagination.value.current = 1;
-      getSoldierData(indexFather, name)
-    } else if (name == '城市云脑会客厅') {
-      showMap.value = false
-      dataSource.value = []
-      dataSource2.value = []
-      pagination.value.total = 0
-      if (clickList.value[1]) {
-        clickList.value[1].content = []
-      }
-      clickList.value[indexFather].content[0] = name
-      if (tabList.value[1]) {
-        tabList.value[1].content = []
-        tabList.value[1].title = ''
-      }
-      wrjFlag.value = true
-      room.value = false
-      roomYuyue.value = true
-      roomResult.value = false
-      emits('add', 6)
-      searchData()
-    } else {
-      if (clickList.value[indexFather]) {
-        clickList.value[indexFather].content.push(name)
-      }
-    }
-  }
-  // 改变查询摄像头接口的labelCode数组
-  mapSearchParam.value.labelCodes = []
-  if (clickList.value[1]) {
-    clickList.value[1].content.map((item) => {
-      mapSearchParam.value.labelCodes.push(item.labelCode)
-    })
-  }
-  console.log('选中的标签code', mapSearchParam.value)
-  mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + ''
-
-  if (name == '云资源' || name == '感知资源') {
-    dataSource.value = []
-    dataSource2.value = []
-    pagination.value.total = 0
-  } else {
-    if (name !== '无人机' && name !== '单兵设备') {
-      getCamera()
-    }
-  }
-}
-
-// 无人机、单兵设备状态
-const wrjStateObj = {
-  0: '待审批',
-  1: '未申请',
-  2: '通过',
-  3: '未通过'
-}
-// 获取无人机、单兵设备
-const getSoldierData = (indexFather, name) => {
-  room.value = true
-  tableHeight.value = 600
-  showMap.value = false
-  dataSource.value = []
-  dataSource2.value = []
-  if (clickList.value[1]) {
-    clickList.value[1].content = []
-  }
-  clickList.value[indexFather].content[0] = name
-  if (tabList.value[1]) {
-    tabList.value[1].title = ''
-    tabList.value[1].content = []
-  }
-  wrjFlag.value = true
-
-  let _params = {
-    type: name,
-    page: pagination.value.current,
-    limit: pagination.value.pageSize,
-  }
-  getSoldierList(_params).then(res => {
-    console.log('res---获取无人机、单兵设备--------->', res);
-    if (res.data.code !== 0) {
-      return message.error(res.data.msg)
-    }
-    let { list = [], total = 0 } = res.data.data;
-    console.log('total------------>', total);
-
-    pagination.value.total = total
-    if (name == '无人机') {
-      list.map((wrj) => {
-        dataSource2.value.push({
-          wrjName: wrj.name,
-          wrjState: wrjStateObj[wrj.state],
-          url: wrj.url,
-          details: wrj.details,
-          ...wrj
-        })
-      })
-    }
-    if (name == '单兵设备') {
-      list.map((db) => {
-        dataSource2.value.push({
-          wrjName: db.name,
-          wrjState: wrjStateObj[db.state],
-          details: db.details,
-          type: db.type,
-          ...db
-        })
-      })
-    }
-
-  }).catch(err => {
-    message.error(err)
-  })
-}
-// 打开视频批量预览
-const batchPreview = async function (page) {
-  if (page.layerX) {
-    page = 1
-  }
-  if (selectedList.value.length > 0) {
-    videoTotal.value = selectedList.value.length
-    const arr = JSON.parse(JSON.stringify(selectedList.value))
-    let start = (page - 1) * 4
-    let list = []
-    list = arr.splice(start, 4)
-    const length = list.length
-    videoList.value = []
-    for (let index = 0; index < length; index++) {
-      const param = {
-        key: list[index].channelId,
-      }
-      let ob = {
-        options: {
-          width: '512px', //播放器宽度
-          height: '288px', //播放器高度
-          color: '#409eff', //主题色
-          title: '', //视频名称
-          src: '', //视频源
-          type: 'm3u8', // 视频源类型
-          muted: false, //静音
-          webFullScreen: false,
-          speedRate: ['0.75', '1.0', '1.25', '1.5', '2.0'], //播放倍速
-          autoPlay: isXiHaiAn ? false : true, //自动播放
-          loop: false, //循环播放
-          mirror: false, //镜像画面
-          ligthOff: false, //关灯模式
-          volume: 0.3, //默认音量大小
-          control: isXiHaiAn ? false : true, //是否显示控制
-          controlBtns: isXiHaiAn ? [] : [
-            'audioTrack',
-            'quality',
-            'speedRate',
-            'volume',
-            'setting',
-            'pip',
-            'pageFullScreen',
-            'fullScreen',
-          ], //显示所有按钮,
-        },
-      }
-      await getStreamByChannelCode(param).then((res) => {
-        // 视频测试
-        // ob.options.src = 'http://playertest.longtailvideo.com/adaptive/bipbop/gear4/prog_index.m3u8'
-        ob.options.src = res.data.data
-        console.log('监测ob的变化', ob)
-        videoList.value.push(ob)
-      })
-    }
-    console.log('验证数据的准确性', videoList)
-    batchVisible.value = true
-  } else {
-    message.error('请选择需要预览的数据')
-  }
-}
-// 打开图片批量预览
-const batchPicturePreview = async function (page) {
-  if (page.layerX) {
-    page = 1
-  }
-  if (selectedList.value.length > 0) {
-    videoTotal.value = selectedList.value.length
-    const arr = JSON.parse(JSON.stringify(selectedList.value))
-    let start = (page - 1) * 4
-    let list = []
-    list = arr.splice(start, 4)
-    const length = list.length
-    videoList.value = []
-    for (let index = 0; index < length; index++) {
-      const param = {
-        channelCode: list[index].channelId,
-      }
-      let ob = {
-        options: {
-          src: '', //图片源
-        },
-      }
-      selectByChannelCode(param).then((res) => {
-        ob.options.src = (res.data.data && res.data.data[0].picUrl) || ''
-        videoList.value.push(ob)
-      })
-    }
-    console.log('验证数据的准确性', videoList)
-    batchPicVisible.value = true
-  } else {
-    message.error('请选择需要预览的数据')
-  }
-}
-// 清空
-const nullClick = () => {
-  if (clickList.value[1]) {
-    clickList.value[1].content = []
-  }
-  mapSearchParam.value.labelCodes = ''
-  getCamera()
-  console.log('hhhhhhhh')
-}
-// 重置
-const clean = () => {
-  mapSearchParam.value.cameraName = ''
-  selectedList.value = []
-  selectedRowKeys.value = []
-  videoList.value = []
-  pagination.value.current = 1
-  mapSearchParam.value.pageNum = 1
-  pagination.value.pageSize = 10
-  getCamera()
-}
-const videoClean = () => {
-  selectedList.value = []
-  selectedRowKeys.value = []
-  videoList.value = []
-  current.value = 1
-}
-// 改变批量预览的分页
-const changePage = (page) => { }
-// 一键申请
-const dept = reactive({})
-// eslint-disable-next-line no-undef
-if (infrastructure) {
-  console.log('infrastructure------------>', infrastructure);
-
-  // eslint-disable-next-line no-undef
-  dept.deptId = infrastructure.deptId || ''
-  // eslint-disable-next-line no-undef
-  dept.deptName = infrastructure.deptName || ''
-}
-const apply = () => {
-  if (selectedRowKeys.value.length != 0) {
-    console.log('一键申请', selectedList.value)
+  const goToApply = (data) => {
+    console.log(data, dept)
     let arr = [
       {
         arr: [
           {
-            description: '',
-            note1: JSON.stringify(selectedList.value),
-            resourceId: '1522550195055828996',
-            resourceName: '摄像头列表',
-            type: '基础设施',
+            description:
+              '申请单兵手持便携终端，提告前端人员执法透明度，加强执法人员与指挥中心实时沟通。',
+            resourceId: 'dbsb',
+            resourceName: data.wrjName,
+            type: '单兵设备',
           },
         ],
         deptId: dept.deptId,
@@ -1455,168 +959,902 @@ const apply = () => {
     router.push({
       path: '/apply',
     })
-  } else {
-    message.error('请选择需要申请的数据')
   }
-}
-// // 添加至购物车
-// const addShopCar = () => {
-//   console.log('添加至购物车')
-// }
-const wrjFlag = ref(false)
-const getCamera = (flag, str) => {
-  console.log('mapSearchParam.value.cameraName------------>', mapSearchParam.value.cameraName);
-  if (flag) {
-    mapSearchParam.value.cameraName = str
-    console.log('赋值===============》', str, mapSearchParam.value)
+  if (whoShow1.value.itShowXiHaiAn) {
+    tabList.value[0].content.push('无人机')
+    tabList.value[0].content.push('单兵设备')
   }
-  console.log('初始化调用')
-  console.log('不选左侧树的时候不调用接口', mapSearchParam.value)
-  if (!whoShow1.value.itShowXiHaiAn) {
-    getCameraByParentId(mapSearchParam.value).then((res) => {
-      console.log('RRRRRRRRRR', res.data.data)
-      dataSource.value = res.data.data
-      pagination.value.total = res.data.count
-    })
-  } else {
-    console.log('mapSearchParam------------>', mapSearchParam);
-    let params = {
-      regionId:
-        mapSearchParam.value.parentId || '70be8c5b664f4bcf869d82f2e8335051',
-      pageNum: mapSearchParam.value.pageNum,
-      pageSize: mapSearchParam.value.pageSize,
-      name: mapSearchParam.value.cameraName || '',
-      longitude: mapSearchParam.value.gpsX || '',
-      latitude: mapSearchParam.value.gpsY || '',
-      radius: mapSearchParam.value.radius || '',
-      status: 1,
-      name: mapSearchParam.value.cameraName
+  // 打开视频预览
+  const openVideo = (id) => {
+    console.log('打开视频', id)
+    const param = {
+      key: id,
     }
-    // todo-临时放开
-    // if (
-    //   params.regionId === '70be8c5b664f4bcf869d82f2e8335051' &&
-    //   !params.name &&
-    //   !params.longitude
-    // ) {
-    //   params.status = ''
-    // }
-    let paramsFather = ''
-    let i = 1
-    for (var key in params) {
-      if (params[key] === '') {
-        delete params[key]
+    getStreamByChannelCode(param).then((res) => {
+      console.log(res)
+      visible.value = true
+      options.src = res.data.data
+    })
+  }
+  // 打开图片预览
+  const openPicture = (id) => {
+    console.log('打开图片', id)
+    const param = {
+      channelCode: id,
+    }
+    selectByChannelCode(param).then((res) => {
+      console.log(res)
+      if (res.data.data && res.data.data[0].picUrl) {
+        options.src = res.data.data[0].picUrl
+        picVisible.value = true
       } else {
-        if (i != 1) {
-          paramsFather += `&${key}=` + params[key]
-          i += 1
-        } else if (i == 1) {
-          paramsFather += `${key}=` + params[key]
-          i += 1
+        message.warning('该点位暂无预览图片！')
+      }
+    })
+  }
+  // const dataTypeList = () => {
+  //   if (tabList.value[0].content.indexOf('视频资源') != -1) {
+  //     tabList.value[1].content = ['123344', '213124']
+  //   }else if(tabList.value[0].content.indexOf('政务云资源') != -1){
+  //     tabList.value[1].content = ['5555', '666']
+
+  //   }
+  // }
+  // dataTypeList()
+  //初始化数据
+  const init = () => {
+    tabList.value.map((item) => {
+      let params = {
+        title: item.title,
+        content: [],
+      }
+      clickList.value.push(params)
+    })
+    mybus.off('tranferToList')
+    mybus.on('tranferToList', () => {
+      console.log('获取到的列表数据')
+    })
+  }
+  let clickList = ref([]) //存储点击的tab
+  init()
+  //点击会议室左侧切换
+  const result = () => {
+    roomYuyue.value = false
+    roomResult.value = true
+    chengguoSearch()
+  }
+  const chengguoSearch = () => {
+    let query = {
+      page: roomPage.value,
+      limit: roomLimit.value,
+      roomName: roomInput.value,
+    }
+    getYuyue(query).then(({ data: res }) => {
+      dataRoom.value = res.data.list
+      roomTotal.value = res.data.total
+    })
+  }
+  const roomResults = () => {
+    roomYuyue.value = true
+    roomResult.value = false
+  }
+  // 查看详情
+  const look = (row) => {
+    visibleRoom.value = true
+    lookData.value = row
+  }
+  //   搜索
+  const onSearch = (searchValue) => {
+    searchData()
+    chengguoSearch()
+  }
+  //重置
+  const reSetSearch = () => {
+    roomInput.value = ''
+    searchData()
+    chengguoSearch()
+  }
+  // 时间选择器限制----可用时间查询
+  //获取不可选择的小时
+  const disabledStartHours = () => {
+    if (roomEndTime.value) {
+      let hours = []
+      let hour = moment().hour()
+      for (let i = hour + 1; i < 24; i++) {
+        hours.push(i)
+      }
+      return hours
+    }
+  }
+  //获取不可选择的分钟
+  const disabledStartMinutes = (selectedHour) => {
+    if (roomEndTime.value) {
+      let minutes = []
+      let hour = moment().hour()
+      let minute = moment().minute()
+      if (selectedHour === hour) {
+        for (let i = minute + 1; i < 60; i++) {
+          minutes.push(i)
         }
       }
+      return minutes
     }
-    getCameraByCondition(paramsFather).then((res) => {
-      dataSource.value = res.data.data
-      pagination.value.total = res.data.count
-      console.log('根据parent查询摄像头', res.data.data)
+  }
+  //获取不可选择的秒
+  const disabledStartSeconds = (selectedHour, selectedMinute) => {
+    if (roomEndTime.value) {
+      let seconds = []
+      let hour = moment().hour()
+      let minute = moment().minute()
+      let second = moment().second()
+      if (selectedHour === hour && selectedMinute.value === minute) {
+        for (let i = second + 1; i < 60; i++) {
+          seconds.push(i)
+        }
+      }
+      return seconds
+    }
+  }
+  //获取不可选择的小时
+  const disabledEndHours = () => {
+    if (roomCreateTime.value) {
+      let hours = []
+      let hour = moment().hour()
+      for (let i = 0; i < hour; i++) {
+        hours.push(i)
+      }
+      return hours
+    }
+  }
+  //获取不可选择的分钟
+  const disabledEndMinutes = (selectedHour) => {
+    if (roomCreateTime.value) {
+      let minutes = []
+      let hour = moment().hour()
+      let minute = moment().minute()
+      if (selectedHour === hour) {
+        for (let i = 0; i < minute; i++) {
+          minutes.push(i)
+        }
+      }
+      return minutes
+    }
+  }
+  //获取不可选择的秒
+  const disabledEndSeconds = (selectedHour, selectedMinute) => {
+    if (roomCreateTime.value) {
+      let seconds = []
+      let hour = moment().hour()
+      let minute = moment().minute()
+      let second = moment().second()
+      if (selectedHour === hour && selectedMinute.value === minute) {
+        for (let i = 0; i < second; i++) {
+          seconds.push(i)
+        }
+      }
+      return seconds
+    }
+  }
+  // 时间选择器限制----会议室预约时段
+  //获取不可选择的小时
+  const disabledTimeHours = () => {
+    if (formState.endTime) {
+      let hours = []
+      let hour = moment().hour()
+      for (let i = hour + 1; i < 24; i++) {
+        hours.push(i)
+      }
+      return hours
+    }
+  }
+  //获取不可选择的分钟
+  const disabledTimeMinutes = (selectedHour) => {
+    if (formState.endTime) {
+      let minutes = []
+      let hour = moment().hour()
+      let minute = moment().minute()
+      if (selectedHour === hour) {
+        for (let i = minute + 1; i < 60; i++) {
+          minutes.push(i)
+        }
+      }
+      return minutes
+    }
+  }
+  //获取不可选择的秒
+  const disabledTimeSeconds = (selectedHour, selectedMinute) => {
+    if (formState.endTime) {
+      let seconds = []
+      let hour = moment().hour()
+      let minute = moment().minute()
+      let second = moment().second()
+      if (selectedHour === hour && selectedMinute.value === minute) {
+        for (let i = second + 1; i < 60; i++) {
+          seconds.push(i)
+        }
+      }
+      return seconds
+    }
+  }
+  //获取不可选择的小时
+  const disabledTimeEndHours = () => {
+    if (formState.startTime) {
+      let hours = []
+      let hour = moment().hour()
+      for (let i = 0; i < hour; i++) {
+        hours.push(i)
+      }
+      return hours
+    }
+  }
+  //获取不可选择的分钟
+  const disabledTimeEndMinutes = (selectedHour) => {
+    if (formState.startTime) {
+      let minutes = []
+      let hour = moment().hour()
+      let minute = moment().minute()
+      if (selectedHour === hour) {
+        for (let i = 0; i < minute; i++) {
+          minutes.push(i)
+        }
+      }
+      return minutes
+    }
+  }
+  //获取不可选择的秒
+  const disabledTimeEndSeconds = (selectedHour, selectedMinute) => {
+    if (formState.startTime) {
+      let seconds = []
+      let hour = moment().hour()
+      let minute = moment().minute()
+      let second = moment().second()
+      if (selectedHour === hour && selectedMinute.value === minute) {
+        for (let i = 0; i < second; i++) {
+          seconds.push(i)
+        }
+      }
+      return seconds
+    }
+  }
+  //分页
+  const onRoomChange = (pageNumber) => {
+    roomPage.value = pageNumber
+    searchData()
+  }
+  const onShowSizeChange = (current, pageSize) => {
+    roomLimit.value = pageSize
+    searchData()
+  }
+  const onRoomChangeChengguo = (pageNumber) => {
+    roomPage.value = pageNumber
+    chengguoSearch()
+  }
+  const onShowSizeChangeChengguo = (current, pageSize) => {
+    roomLimit.value = pageSize
+    chengguoSearch()
+  }
+  //预约
+  const appointment = (item) => {
+    dateId.value = item.id
+    formState.roomId = item.id
+    appointmentRoom.value = true
+  }
+  //预约弹框 选择日期
+  const handleChange = (i) => {
+    let query = {
+      date: i, //查询的riqi
+      roomId: dateId.value, //会议室主键
+    }
+    getDate(query).then(({ data: res }) => {
+      roomDateList.value = res.data
     })
   }
-}
-defineExpose({
-  getCamera,
-})
-//加入申购车
-const addShoppingCart = () => {
-  if (selectedList.value.length > 0) {
-    sgcInsert({
-      delFlag: '0',
-      resourceId: '8888888880000000001',
-      note1: selectedList.value,
-      // userId: userId.value,
-    }).then((res) => {
-      console.log(res)
-      message.success('添加申购车成功！')
-      mybus.emit('getSgcNum')
-    })
-  } else {
-    message.error('请选择需要添加申购车的数据')
+
+  const columnsRomm = [
+    {
+      title: '会议室名称',
+      dataIndex: 'roomName',
+      align: 'center',
+    },
+    {
+      title: '预约时段',
+      key: 'bookDate',
+      align: 'center',
+    },
+    {
+      title: '预约状态',
+      key: 'state',
+      align: 'center',
+    },
+    {
+      title: '预约详情',
+      key: 'action',
+      align: 'center',
+    },
+  ]
+  const dataRoom = ref([])
+  const bodystyle = {
+    paddingTop: 0,
+    borderBottom: 0,
   }
-}
-// 表格
-const dataSource = ref([])
-const dataSource2 = ref([])
-const columns = ref([
-  {
-    title: '名称',
-    dataIndex: 'channelName',
-    key: 'channelName',
-  },
-  {
-    title: '归属',
-    dataIndex: 'nodeName',
-    width: '60%',
-    key: 'nodeName',
-  },
-  {
-    title: '操作',
-    dataIndex: 'operation',
-    width: '10%',
-    key: 'channelId',
-  },
-])
-const columns2 = ref([
-  {
-    title: '名称',
-    dataIndex: 'wrjName',
-    key: 'wrjName',
-    align: 'center'
-  },
-  {
-    title: '申请状态',
-    dataIndex: 'wrjState',
-    width: '60%',
-    key: 'wrjState',
-    align: 'center'
-  },
-  {
-    title: '操作',
-    dataIndex: 'operation',
-    width: '20%',
-    key: 'wrjName',
-    align: 'center'
-  },
-])
-// const allClick = ref([])
-const onSelectChange = (record, selected, selectedRows, nativeEvent) => {
-  console.log('hahhahah', record, selected, selectedRows, nativeEvent)
-  if (selected) {
-    if (selectedRowKeys.value.length == 1000) {
-      message.warning('最多只能添加1000个摄像头！')
+  const handleOk = (e) => {
+    console.log(e)
+  }
+  //文件上传成功回调
+  const roomUpload = (response) => {
+    if (response.file.response !== undefined) {
+      fileList.value = response.fileList
+      formState.file = response.file.response.data
+    }
+  }
+  //提交预约
+  const onSubmit = () => {
+    validate()
+      .then(() => {
+        setSubmit(formState).then(({ data: res }) => {
+          appointmentRoom.value = false
+          formState.roomId = ''
+          formState.bookDate = ''
+          formState.startTime = '' //开始时间
+          formState.endTime = '' //结束时间
+          formState.name = ''
+          formState.phone = ''
+          formState.dept = ''
+          formState.matter = ''
+          formState.file = ''
+          fileList.value = []
+          searchData()
+        })
+      })
+      .catch((err) => {
+        console.log('error', err)
+      })
+  }
+  //会议室查询接口
+  const searchData = () => {
+    let query = {
+      bookDate: roomCerateDate.value, //	预约开始时间 年月日
+      startTime: roomCreateTime.value, //预约开始时 间时分秒
+      endTime: roomEndTime.value, //	预约结束时间
+      name: roomInput.value, //会议室名称
+      page: roomPage.value, //页码
+      limit: roomLimit.value, //每页条数
+    }
+    getRoomSearch(query).then(({ data: res }) => {
+      roomList.value = res.data.list
+      roomTotal.value = res.data.total
+    })
+  }
+  const emits = defineEmits(['add'])
+  //表格的高度
+  let tableHeight = ref('600')
+  //tab切换点击事件
+  const tabClick = (indexFather, name) => {
+    console.log(
+      '点击tab================>',
+      indexFather,
+      name,
+      clickList.value[indexFather]
+    )
+    selectedRowKeys.value = []
+    selectedList.value = []
+    if (clickList.value[indexFather].content.indexOf(name) != -1) {
+      if (name == '视频资源') {
+        cloudResourcesFlag.value = false;
+        room.value = true
+        tableHeight.value = 330
+        showMap.value = true
+        tabList.value[1].title = '视频标签'
+      } else if (name == '政务云资源') {
+        cloudResourcesFlag.value = true;
+        room.value = true
+        tableHeight.value = 600
+        showMap.value = false
+        dataSource.value = []
+        dataSource2.value = []
+        pagination.value.total = 0
+        tabList.value[1].title = '政务云资源分类'
+      } else if (name == '感知资源') {
+        cloudResourcesFlag.value = false;
+        room.value = true
+        tableHeight.value = 330
+        showMap.value = true
+        dataSource.value = []
+        dataSource2.value = []
+        pagination.value.total = 0
+      } else if (name == '城市云脑会客厅') {
+          cloudResourcesFlag.value = false;
+        //     room.value = false
+        //     wrjFlag.value = true
+        //     showMap.value = false
+        // roomYuyue.value = true
+        //     roomResult.value = false
+        //     tabList.value[1] = []
+        //     emits('add', 6)
+        //     searchData()
+      }
+      clickList.value[indexFather].content.splice(
+        clickList.value[indexFather].content.indexOf(name),
+        1
+      )
     } else {
-      selectedList.value.push(record)
-      selectedRowKeys.value.push(record.channelCode || record.channelId)
+      if (name == '视频资源') {
+        wrjFlag.value = false
+        cloudResourcesFlag.value = false;
+        tableHeight.value = 330
+        showMap.value = true
+        tabList.value[1].content = []
+        clickList.value[1].content = []
+        tabList.value[1].title = '视频标签'
+        clickList.value[indexFather].content[0] = name
+        dataSource.value = []
+        dataSource2.value = []
+        room.value = true
+        getCameraAllLabel().then((res) => {
+          res.data.data.forEach((val) => {
+            tabList.value[1].content.push({
+              labelCode: val.labelCode,
+              labelName: val.labelName,
+            })
+          })
+        })
+        // 改变查询摄像头接口的labelCode数组
+        mapSearchParam.value.labelCodes = []
+        clickList.value[1].content.map((item) => {
+          mapSearchParam.value.labelCodes.push(item.labelCode)
+        })
+        console.log('选中的标签code', mapSearchParam.value)
+        mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + ''
+        emits('add', 1)
+        getCamera()
+      } else if (name == '政务云资源') {
+        cloudResourcesFlag.value = true;
+        tableHeight.value = 600
+        showMap.value = false
+        dataSource.value = []
+        dataSource2.value = []
+        pagination.value.total = 0
+        clickList.value[1].content = []
+        tabList.value[1].title = '政务云资源分类'
+        clickList.value[indexFather].content[0] = name
+        tabList.value[1].content = [
+          '云主机',
+          '算力主机',
+          '对象存储',
+          '堡垒机',
+          '防火墙',
+          '网闸',
+          '负载均衡',
+          '公网IP',
+        ]
+        room.value = true
+        wrjFlag.value = false
+        emits('add', 2)
+      } else if (name == '感知资源') {
+        cloudResourcesFlag.value = false;
+        tableHeight.value = 330
+        showMap.value = true
+        clickList.value[1].content = []
+        pagination.value.total = 0
+        tabList.value[1].title = '感知资源分类'
+        clickList.value[indexFather].content[0] = name
+        tabList.value[1].content = []
+        dataSource.value = []
+        dataSource2.value = []
+        room.value = true
+        wrjFlag.value = false
+        emits('add', 3)
+      } else if (name == '无人机') {
+        cloudResourcesFlag.value = false;
+        room.value = true
+        tableHeight.value = 600
+        showMap.value = false
+        dataSource.value = []
+        dataSource2.value = []
+        pagination.value.total = 0
+        clickList.value[1].content = []
+        clickList.value[indexFather].content[0] = name
+        tabList.value[1].title = ''
+        tabList.value[1].content = []
+        uavAndIndividualSoldier.uavList.map((wrj) => {
+          dataSource2.value.push({
+            wrjName: wrj.name,
+            wrjState: '已申请',
+            url: wrj.url,
+            details: wrj.details,
+          })
+        })
+        wrjFlag.value = true
+      } else if (name == '单兵设备') {
+        cloudResourcesFlag.value = false;
+        room.value = true
+        tableHeight.value = 600
+        showMap.value = false
+        dataSource.value = []
+        dataSource2.value = []
+        pagination.value.total = 0
+        clickList.value[1].content = []
+        clickList.value[indexFather].content[0] = name
+        tabList.value[1].title = ''
+        tabList.value[1].content = []
+        uavAndIndividualSoldier.individualSoldier.map((db) => {
+          dataSource2.value.push({
+            wrjName: db.name,
+            wrjState: '未申请',
+            details: db.details,
+            type: db.type,
+          })
+        })
+        wrjFlag.value = true
+      } else if (name == '城市云脑会客厅') {
+        cloudResourcesFlag.value = false;
+        showMap.value = false
+        dataSource.value = []
+        dataSource2.value = []
+        pagination.value.total = 0
+        clickList.value[1].content = []
+        clickList.value[indexFather].content[0] = name
+        tabList.value[1].title = ''
+        tabList.value[1].content = []
+        wrjFlag.value = true
+        room.value = false
+        // wrjFlag.value = true
+        // showMap.value = false
+        roomYuyue.value = true
+        roomResult.value = false
+        // tabList.value[1] = []
+        emits('add', 6)
+        searchData()
+      } else {
+        clickList.value[indexFather].content.push(name)
+      }
     }
-  } else {
-    selectedList.value = selectedList.value.filter(
-      (item) => item.idtCameraChannel !== record.idtCameraChannel
-    )
-    selectedRowKeys.value.splice(
-      selectedRowKeys.value.indexOf(record.channelCode || record.channelId),
-      1
-    )
-  }
-  console.log('已选中======================>', selectedList.value)
-  // selectedList.value = selectedRows
-  // allClick.value = selectedRowKeys
-}
-const onSelectAll = (selected, selectedRows, changeRows) => {
-  if (selected) {
-    changeRows.map((val) => {
-      selectedList.value.push(val)
-      selectedRowKeys.value.push(val.channelCode || val.channelId)
+    // 改变查询摄像头接口的labelCode数组
+    mapSearchParam.value.labelCodes = []
+    clickList.value[1].content.map((item) => {
+      mapSearchParam.value.labelCodes.push(item.labelCode)
     })
-    if (selectedRowKeys.value.length > 1000) {
-      message.warning('最多只能添加1000个摄像头！')
+    console.log('选中的标签code', mapSearchParam.value)
+    mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + ''
+    // let fatherName = ref('视频资源')
+    // if (name == '视频资源' || name == '政务云资源' || name == '感知资源') {
+    //   fatherName.value == name
+    // }
+    // if (fatherName.value == '视频资源') {
+    //   getCamera()
+    // } else {
+    //   dataSource.value = []
+    //   pagination.value.total = 0
+    // }
+    if (name == '政务云资源' || name == '感知资源') {
+      dataSource.value = []
+      dataSource2.value = []
+      pagination.value.total = 0
+    } else {
+      if (name !== '无人机' && name !== '单兵设备') {
+        getCamera()
+      }
+    }
+  }
+  // 打开视频批量预览
+  const batchPreview = async function (page) {
+    if (page.layerX) {
+      page = 1
+    }
+    if (selectedList.value.length > 0) {
+      videoTotal.value = selectedList.value.length
+      const arr = JSON.parse(JSON.stringify(selectedList.value))
+      let start = (page - 1) * 4
+      let list = []
+      list = arr.splice(start, 4)
+      const length = list.length
+      videoList.value = []
+      for (let index = 0; index < length; index++) {
+        const param = {
+          key: list[index].channelId,
+        }
+        let ob = {
+          options: {
+            width: '512px', //播放器宽度
+            height: '288px', //播放器高度
+            color: '#409eff', //主题色
+            title: '', //视频名称
+            src: '', //视频源
+            type: 'm3u8', // 视频源类型
+            muted: false, //静音
+            webFullScreen: false,
+            speedRate: ['0.75', '1.0', '1.25', '1.5', '2.0'], //播放倍速
+            autoPlay: isXiHaiAn, //自动播放
+            loop: false, //循环播放
+            mirror: false, //镜像画面
+            ligthOff: false, //关灯模式
+            volume: 0.3, //默认音量大小
+            control: true, //是否显示控制
+            controlBtns: [
+              'audioTrack',
+              'quality',
+              'speedRate',
+              'volume',
+              'setting',
+              'pip',
+              'pageFullScreen',
+              'fullScreen',
+            ], //显示所有按钮,
+          },
+        }
+        await getStreamByChannelCode(param).then((res) => {
+          ob.options.src = res.data.data
+          console.log('监测ob的变化', ob)
+          videoList.value.push(ob)
+        })
+      }
+      console.log('验证数据的准确性', videoList)
+      batchVisible.value = true
+    } else {
+      message.error('请选择需要预览的数据')
+    }
+  }
+  // 打开图片批量预览
+  const batchPicturePreview = async function (page) {
+    if (page.layerX) {
+      page = 1
+    }
+    if (selectedList.value.length > 0) {
+      videoTotal.value = selectedList.value.length
+      const arr = JSON.parse(JSON.stringify(selectedList.value))
+      let start = (page - 1) * 4
+      let list = []
+      list = arr.splice(start, 4)
+      const length = list.length
+      videoList.value = []
+      for (let index = 0; index < length; index++) {
+        const param = {
+          channelCode: list[index].channelId,
+        }
+        let ob = {
+          options: {
+            src: '', //图片源
+          },
+        }
+        selectByChannelCode(param).then((res) => {
+          ob.options.src = (res.data.data && res.data.data[0].picUrl) || ''
+          videoList.value.push(ob)
+        })
+      }
+      console.log('验证数据的准确性', videoList)
+      batchPicVisible.value = true
+    } else {
+      message.error('请选择需要预览的数据')
+    }
+  }
+  // 清空
+  const nullClick = () => {
+    clickList.value[1].content = []
+    mapSearchParam.value.labelCodes = ''
+    getCamera()
+    console.log('hhhhhhhh')
+  }
+  // 重置
+  const clean = () => {
+    mapSearchParam.value.cameraName = ''
+    selectedList.value = []
+    selectedRowKeys.value = []
+    videoList.value = []
+    pagination.value.current = 1
+    mapSearchParam.value.pageNum = 1
+    pagination.value.pageSize = 10
+    getCamera()
+  }
+  const videoClean = () => {
+    selectedList.value = []
+    selectedRowKeys.value = []
+    videoList.value = []
+    current.value = 1
+  }
+  // 改变批量预览的分页
+  const changePage = (page) => {}
+  // 一键申请
+  const dept = reactive({})
+  // eslint-disable-next-line no-undef
+  if (infrastructure) {
+    // eslint-disable-next-line no-undef
+    dept.deptId = infrastructure.deptId
+    // eslint-disable-next-line no-undef
+    dept.deptName = infrastructure.deptName
+  }
+  const apply = () => {
+    if (selectedRowKeys.value.length != 0) {
+      console.log('一键申请', selectedList.value)
+      let arr = [
+        {
+          arr: [
+            {
+              description: '',
+              note1: JSON.stringify(selectedList.value),
+              resourceId: '1522550195055828996',
+              resourceName: '摄像头列表',
+              type: '基础设施',
+            },
+          ],
+          deptId: dept.deptId,
+          deptName: dept.deptName,
+        },
+      ]
+      localStorage.setItem('applyList', JSON.stringify(arr))
+      router.push({
+        path: '/apply',
+      })
+    } else {
+      message.error('请选择需要申请的数据')
+    }
+  }
+  // // 添加至购物车
+  // const addShopCar = () => {
+  //   console.log('添加至购物车')
+  // }
+  const wrjFlag = ref(false)
+  const cloudResourcesFlag = ref(false)
+  const getCamera = (flag, str) => {
+    if (flag) {
+      mapSearchParam.value.cameraName = str
+      console.log('赋值===============》', str, mapSearchParam.value)
+    }
+    console.log('初始化调用')
+    console.log('不选左侧树的时候不调用接口', mapSearchParam.value)
+    if (!whoShow1.value.itShowXiHaiAn) {
+      getCameraByParentId(mapSearchParam.value).then((res) => {
+        console.log('RRRRRRRRRR', res.data.data)
+        dataSource.value = res.data.data
+        pagination.value.total = res.data.count
+      })
+    } else {
+      let params = {
+        regionId:
+          mapSearchParam.value.parentId || '70be8c5b664f4bcf869d82f2e8335051',
+        pageNum: mapSearchParam.value.pageNum,
+        pageSize: mapSearchParam.value.pageSize,
+        name: mapSearchParam.value.cameraName || '',
+        longitude: mapSearchParam.value.gpsX || '',
+        latitude: mapSearchParam.value.gpsY || '',
+        radius: mapSearchParam.value.radius || '',
+        status: 1,
+      }
+      if (
+        params.regionId === '70be8c5b664f4bcf869d82f2e8335051' &&
+        !params.name &&
+        !params.longitude
+      ) {
+        params.status = ''
+      }
+      let paramsFather = ''
+      let i = 1
+      for (var key in params) {
+        if (params[key] === '') {
+          delete params[key]
+        } else {
+          if (i != 1) {
+            paramsFather += `&${key}=` + params[key]
+            i += 1
+          } else if (i == 1) {
+            paramsFather += `${key}=` + params[key]
+            i += 1
+          }
+        }
+      }
+      getCameraByCondition(paramsFather).then((res) => {
+        dataSource.value = res.data.data
+        pagination.value.total = res.data.count
+        console.log('根据parent查询摄像头', res.data.data)
+      })
+    }
+  }
+  defineExpose({
+    getCamera,
+  })
+  //加入申购车
+  const addShoppingCart = () => {
+    if (selectedList.value.length > 0) {
+      sgcInsert({
+        delFlag: '0',
+        resourceId: '8888888880000000001',
+        note1: selectedList.value,
+        // userId: userId.value,
+      }).then((res) => {
+        console.log(res)
+        message.success('添加申购车成功！')
+        mybus.emit('getSgcNum')
+      })
+    } else {
+      message.error('请选择需要添加申购车的数据')
+    }
+  }
+  // 申请政务云资源
+   const applyCloudResources = () => {
+    window.open("http://15.72.183.88:8760/yzy/login")
+  }
+  // 表格
+  const dataSource = ref([])
+  const dataSource2 = ref([])
+  const columns = ref([
+    {
+      title: '名称',
+      dataIndex: 'channelName',
+      key: 'channelName',
+    },
+    {
+      title: '归属',
+      dataIndex: 'nodeName',
+      width: '60%',
+      key: 'nodeName',
+    },
+    {
+      title: '操作',
+      dataIndex: 'operation',
+      width: '10%',
+      key: 'channelId',
+    },
+  ])
+  const columns2 = ref([
+    {
+      title: '名称',
+      dataIndex: 'wrjName',
+      key: 'wrjName',
+    },
+    {
+      title: '申请状态',
+      dataIndex: 'wrjState',
+      width: '60%',
+      key: 'wrjState',
+    },
+    {
+      title: '操作',
+      dataIndex: 'operation',
+      width: '20%',
+      key: 'wrjName',
+    },
+  ])
+  // const allClick = ref([])
+  const onSelectChange = (record, selected, selectedRows, nativeEvent) => {
+    console.log('hahhahah', record, selected, selectedRows, nativeEvent)
+    if (selected) {
+      if (selectedRowKeys.value.length == 1000) {
+        message.warning('最多只能添加1000个摄像头！')
+      } else {
+        selectedList.value.push(record)
+        selectedRowKeys.value.push(record.channelCode || record.channelId)
+      }
+    } else {
+      selectedList.value = selectedList.value.filter(
+        (item) => item.idtCameraChannel !== record.idtCameraChannel
+      )
+      selectedRowKeys.value.splice(
+        selectedRowKeys.value.indexOf(record.channelCode || record.channelId),
+        1
+      )
+    }
+    console.log('已选中======================>', selectedList.value)
+    // selectedList.value = selectedRows
+    // allClick.value = selectedRowKeys
+  }
+  const onSelectAll = (selected, selectedRows, changeRows) => {
+    if (selected) {
+      changeRows.map((val) => {
+        selectedList.value.push(val)
+        selectedRowKeys.value.push(val.channelCode || val.channelId)
+      })
+      if (selectedRowKeys.value.length > 1000) {
+        message.warning('最多只能添加1000个摄像头！')
+        changeRows.map((val) => {
+          selectedList.value = selectedList.value.filter(
+            (item) => item.idtCameraChannel !== val.idtCameraChannel
+          )
+          selectedRowKeys.value.splice(
+            selectedRowKeys.value.indexOf(val.channelCode || val.channelId),
+            1
+          )
+        })
+      }
+    } else {
       changeRows.map((val) => {
         selectedList.value = selectedList.value.filter(
           (item) => item.idtCameraChannel !== val.idtCameraChannel
@@ -1627,140 +1865,221 @@ const onSelectAll = (selected, selectedRows, changeRows) => {
         )
       })
     }
-  } else {
-    changeRows.map((val) => {
-      selectedList.value = selectedList.value.filter(
-        (item) => item.idtCameraChannel !== val.idtCameraChannel
-      )
-      selectedRowKeys.value.splice(
-        selectedRowKeys.value.indexOf(val.channelCode || val.channelId),
-        1
-      )
-    })
+    console.log('heiheiheiehiehei', selected, selectedRows, changeRows)
   }
-  console.log('heiheiheiehiehei', selected, selectedRows, changeRows)
-}
-
-// 切换tab
-const handleTableChange = (val) => {
-  pagination.value.current = val.current
-  pagination.value.pageSize = val.pageSize
-  mapSearchParam.value.pageNum = val.current
-  mapSearchParam.value.pageSize = val.pageSize
-
-  let _arr = clickList.value.filter(v => v.content.includes('单兵设备') || v.content.includes('无人机')) || []
-  let _tab_name = _arr[0] && _arr[0].content && _arr[0].content[0]
-  // 无人机、单兵设备
-  if (_tab_name) {
-    getSoldierData(0, _tab_name)
-  } else {
+  const handleTableChange = (val) => {
+    pagination.value.current = val.current
+    pagination.value.pageSize = val.pageSize
+    mapSearchParam.value.pageNum = val.current
+    mapSearchParam.value.pageSize = val.pageSize
     getCamera()
+    // this.getTableList()
   }
-}
-
-const videoShowMsg = () => {
-  message.warning('请申请后在我的申请中预览视频!')
-}
 </script>
 <style lang="less" scoped>
-.infrastructrueBox {
-  padding: 0.2rem;
-  background: #ffffff;
-  border-bottom: 0.01rem solid rgba(150, 144, 144, 0.3);
-
-  .infrastructrue-tab {
-    span {
-      display: inline-block;
-      height: 0.24rem;
-      font-size: 0.14rem;
-      line-height: 0.24rem;
-      border: 0;
-      border-radius: 0.12rem;
-      margin-left: 0.1rem;
-      text-align: center;
-      color: #666666;
-      cursor: pointer;
-      padding: 0 0.08rem;
-    }
-
-    .leftType {
-      margin: 0.2rem 0;
-      margin-right: 0.06rem;
-    }
-
-    .down {
-      background: #0087ff;
-      color: #ffffff;
-    }
-
-    .tabBox {
-      padding-bottom: 0.16rem;
-    }
-  }
-
-  .infrastructrue-content {
-    display: flex;
-    justify-content: space-between;
-    padding: 0.14rem 0.2rem 0.1rem;
+  .infrastructrueBox {
+    padding: 0.2rem;
+    // background: #f3f5f9;
     background: #ffffff;
-
-    .contentNum {
-      position: relative;
-      display: flex;
-
-      p {
+    /* padding: 0.16rem; */
+    border-bottom: 0.01rem solid rgba(150, 144, 144, 0.3);
+    .infrastructrue-tab {
+      // background: #ffffff;
+      // padding: 0.2rem;
+      // border-bottom: 0.01rem solid rgba(150, 144, 144, 0.3);
+      span {
+        display: inline-block;
+        height: 0.24rem;
+        font-size: 0.14rem;
+        line-height: 0.24rem;
+        border: 0;
+        border-radius: 0.12rem;
+        margin-left: 0.1rem;
+        text-align: center;
         color: #666666;
-        padding: 0;
-        margin: 0;
-
-        span {
-          color: #0087ff;
-          font-size: 0.2rem;
-          font-weight: 500;
-        }
+        cursor: pointer;
+        padding: 0 0.08rem;
       }
-
-      p:first-of-type {
-        padding-right: 0.16rem;
-        margin-right: 0.16rem;
+      .leftType {
+        margin: 0.2rem 0;
+        margin-right: 0.06rem;
       }
-
-      .boundary {
-        position: absolute;
-        left: 0.9rem;
-        top: 0.07rem;
-        display: block;
-        width: 0.02rem;
-        border-radius: 0.01rem;
-        height: 0.2rem;
-        background: rgba(150, 144, 144, 0.3);
+      .down {
+        background: #0087ff;
+        color: #ffffff;
+      }
+      .tabBox {
+        margin-bottom: 0.16rem;
+      }
+      .tabBox:last-of-type {
+        margin-bottom: 0;
       }
     }
-
-    .contentRight {
-      position: relative;
+    .infrastructrue-content {
       display: flex;
       justify-content: space-between;
-
-      .boundary {
-        position: absolute;
-        left: 3.74rem;
-        top: 0.07rem;
-        display: block;
-        width: 0.02rem;
-        border-radius: 0.01rem;
-        height: 0.2rem;
-        background: rgba(150, 144, 144, 0.3);
+      padding: 0.14rem 0.2rem 0.1rem;
+      background: #ffffff;
+      .contentNum {
+        position: relative;
+        display: flex;
+        p {
+          color: #666666;
+          padding: 0;
+          margin: 0;
+          span {
+            color: #0087ff;
+            font-size: 0.2rem;
+            font-weight: 500;
+          }
+        }
+        p:first-of-type {
+          padding-right: 0.16rem;
+          margin-right: 0.16rem;
+        }
+        .boundary {
+          position: absolute;
+          left: 0.9rem;
+          top: 0.07rem;
+          display: block;
+          width: 0.02rem;
+          border-radius: 0.01rem;
+          height: 0.2rem;
+          background: rgba(150, 144, 144, 0.3);
+        }
       }
-
+      .contentRight {
+        position: relative;
+        display: flex;
+        justify-content: space-between;
+        .boundary {
+          position: absolute;
+          left: 3.74rem;
+          top: 0.07rem;
+          display: block;
+          width: 0.02rem;
+          border-radius: 0.01rem;
+          height: 0.2rem;
+          background: rgba(150, 144, 144, 0.3);
+        }
+        .searchInput {
+          display: flex;
+          margin-right: 0.2rem;
+          .ant-input-search {
+            max-width: 4rem;
+          }
+          :deep(.ant-input) {
+            width: 2rem;
+            height: 0.36rem;
+            font-size: 0.14rem;
+            color: #b2b2b2;
+            background: #f5f5f5;
+          }
+          :deep(.ant-input-group-addon) {
+            display: inline-block;
+            margin-left: 0.1rem;
+            .ant-input-search-button {
+              width: 0.8rem;
+              height: 0.36rem;
+              background: #0558e1;
+              border-radius: 0.04rem;
+              font-size: 0.14rem;
+            }
+          }
+          :deep(.ant-btn) {
+            background: #0558e1;
+            border-radius: 0.04rem;
+          }
+        }
+        .buttonAdd {
+          background: #0558e1;
+          border-radius: 0.04rem;
+          height: 0.36rem;
+          border-color: #0558e1;
+          margin-left: 0.1rem;
+        }
+      }
+    }
+    .infrastructrue-table {
+      .ant-table-striped :deep(.table-striped) td {
+        background-color: #fafafa;
+      }
+    }
+    .map-contain {
+      // width: 9.46rem;
+      height: 4.1rem;
+      margin-left: 0.16rem;
+      position: relative;
+    }
+  }
+  .roomBackground {
+    background: #0058e1;
+    color: #ffffff;
+  }
+  .nullBackground {
+    background: #f3f5f9;
+    color: #0087ff;
+  }
+  :deep(.ant-form-item-control-input-content) {
+    margin-left: 0.15rem;
+  }
+  :deep(.ant-col) {
+    .ant-form-item {
+      margin-bottom: 0;
+    }
+  }
+  .jinggaoD {
+    display: flex;
+    align-items: center;
+  }
+  .jinggaoNull {
+    display: none;
+  }
+  .imgJinggao {
+    width: 0.2rem;
+    height: 0.2rem;
+    background: url('~@/assets/home/jingao.png') no-repeat;
+    background-size: 100%;
+  }
+  .introduction {
+    :deep(.ant-form-item-control) {
+      margin-left: -2.1rem;
+    }
+  }
+  .roomBox {
+    .leftMake {
+      float: left;
+      margin-left: -1rem;
+      margin-top: -0.5rem;
+      font-size: 0.2rem;
+      cursor: pointer;
+      .leftTop {
+        width: 0.6rem;
+        height: 1.75rem;
+        border-top-left-radius: 0.08rem;
+        border-bottom-left-radius: 0.08rem;
+        padding: 0.13rem;
+        text-align: center;
+      }
+      .leftBottom {
+        width: 0.6rem;
+        height: 1.75rem;
+        border-top-left-radius: 0.08rem;
+        border-bottom-left-radius: 0.08rem;
+        padding: 0.2rem 0.13rem 0.1rem 0.1rem;
+        text-align: center;
+      }
+    }
+    .roomSearch {
+      display: flex;
+      align-items: center;
       .searchInput {
         display: flex;
         margin-right: 0.2rem;
-
-        .ant-input-search {
-          max-width: 4rem;
-        }
-
+        margin-left: 0.2rem;
+        // .ant-input-search {
+        //   max-width: 4rem;
+        // }
         :deep(.ant-input) {
           width: 2rem;
           height: 0.36rem;
@@ -1768,340 +2087,150 @@ const videoShowMsg = () => {
           color: #b2b2b2;
           background: #f5f5f5;
         }
-
         :deep(.ant-input-group-addon) {
           display: inline-block;
           margin-left: 0.1rem;
-
           .ant-input-search-button {
             width: 0.8rem;
             height: 0.36rem;
             background: #0558e1;
-            border-radius: 0.04rem;
+            border-radius: 0.06rem;
             font-size: 0.14rem;
           }
         }
-
         :deep(.ant-btn) {
-          background: #0558e1;
-          border-radius: 0.04rem;
-        }
-      }
-
-      .buttonAdd {
-        background: #0558e1;
-        border-radius: 0.04rem;
-        height: 0.36rem;
-        border-color: #0558e1;
-        margin-left: 0.1rem;
-      }
-    }
-  }
-
-  .infrastructrue-table {
-    .ant-table-striped :deep(.table-striped) td {
-      background-color: #fafafa;
-    }
-  }
-
-  .map-contain {
-    // width: 9.46rem;
-    height: 4.1rem;
-    margin-left: 0.16rem;
-    position: relative;
-  }
-}
-
-.roomBackground {
-  background: #0058e1;
-  color: #ffffff;
-}
-
-.nullBackground {
-  background: #f3f5f9;
-  color: #0087ff;
-}
-
-:deep(.ant-form-item-control-input-content) {
-  margin-left: 0.15rem;
-}
-
-:deep(.ant-col) {
-  .ant-form-item {
-    margin-bottom: 0;
-  }
-}
-
-.jinggaoD {
-  display: flex;
-  align-items: center;
-}
-
-.jinggaoNull {
-  display: none;
-}
-
-.imgJinggao {
-  width: 0.2rem;
-  height: 0.2rem;
-  background: url('~@/assets/home/jingao.png') no-repeat;
-  background-size: 100%;
-}
-
-.introduction {
-  :deep(.ant-form-item-control) {
-    margin-left: -2.1rem;
-  }
-}
-
-.roomBox {
-  .leftMake {
-    float: left;
-    margin-left: -1rem;
-    margin-top: -0.5rem;
-    font-size: 0.2rem;
-    cursor: pointer;
-
-    .leftTop {
-      width: 0.6rem;
-      height: 1.75rem;
-      border-top-left-radius: 0.08rem;
-      border-bottom-left-radius: 0.08rem;
-      padding: 0.13rem;
-      text-align: center;
-    }
-
-    .leftBottom {
-      width: 0.6rem;
-      height: 1.75rem;
-      border-top-left-radius: 0.08rem;
-      border-bottom-left-radius: 0.08rem;
-      padding: 0.2rem 0.13rem 0.1rem 0.1rem;
-      text-align: center;
-    }
-  }
-
-  .roomSearch {
-    display: flex;
-    align-items: center;
-
-    .searchInput {
-      display: flex;
-      margin-right: 0.2rem;
-      margin-left: 0.2rem;
-
-      // .ant-input-search {
-      //   max-width: 4rem;
-      // }
-      :deep(.ant-input) {
-        width: 2rem;
-        height: 0.36rem;
-        font-size: 0.14rem;
-        color: #b2b2b2;
-        background: #f5f5f5;
-      }
-
-      :deep(.ant-input-group-addon) {
-        display: inline-block;
-        margin-left: 0.1rem;
-
-        .ant-input-search-button {
-          width: 0.8rem;
-          height: 0.36rem;
-          background: #0558e1;
           border-radius: 0.06rem;
-          font-size: 0.14rem;
         }
       }
-
-      :deep(.ant-btn) {
-        border-radius: 0.06rem;
+    }
+    .roomTableList {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin: 0.4rem 0 0.2rem 0;
+      .roomTime {
+        display: flex;
+        align-items: center;
+        :deep(.ant-space-vertical) {
+          flex-direction: inherit;
+          margin-left: 0.2rem;
+        }
       }
     }
-  }
-
-  .roomTableList {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin: 0.4rem 0 0.2rem 0;
-
-    .roomTime {
+    .roomItem {
+      width: 10.3rem;
+      height: 2rem;
+      border-top: 1px #d5d4d4 solid;
       display: flex;
       align-items: center;
+      .leftImg {
+        width: 2.4rem;
+        height: 1.75rem;
+        margin: 0 0.3rem 0 0.15rem;
 
-      :deep(.ant-space-vertical) {
-        flex-direction: inherit;
-        margin-left: 0.2rem;
+        // background: url('~@/assets/home/yyzy_square.png') no-repeat;
+        background-size: 100%;
+        img {
+          width: 100%;
+          height: 100%;
+        }
+      }
+      .rightContent {
+        height: 1.75rem;
+        width: 5.8rem;
+        .topContent {
+          font-size: 0.2rem;
+          color: #000;
+          font-weight: 600;
+        }
+        .centerContent {
+          display: flex;
+          justify-content: space-between;
+          font-size: 0.14rem;
+          margin: 0.15rem 0 0.2rem 0;
+        }
       }
     }
-  }
-
-  .roomItem {
-    width: 10.3rem;
-    height: 2rem;
-    border-top: 1px #d5d4d4 solid;
-    display: flex;
-    align-items: center;
-
-    .leftImg {
-      width: 2.4rem;
-      height: 1.75rem;
-      margin: 0 0.3rem 0 0.15rem;
-
-      // background: url('~@/assets/home/yyzy_square.png') no-repeat;
-      background-size: 100%;
-
-      img {
-        width: 100%;
-        height: 100%;
-      }
+    :deep(.ant-pagination) {
+      float: right;
     }
-
-    .rightContent {
-      height: 1.75rem;
-      width: 5.8rem;
-
-      .topContent {
-        font-size: 0.2rem;
-        color: #000;
-        font-weight: 600;
-      }
-
-      .centerContent {
-        display: flex;
-        justify-content: space-between;
-        font-size: 0.14rem;
-        margin: 0.15rem 0 0.2rem 0;
-      }
+    :deep(.ant-pagination) {
+      text-align: end;
     }
   }
-
-  :deep(.ant-pagination) {
-    float: right;
-  }
-
-  :deep(.ant-pagination) {
-    text-align: end;
-  }
-}
 </style>
 <style lang="less">
-.wrj {
-  .ant-modal-body {
-    height: 700px !important;
-    overflow-y: auto;
-  }
-}
-
-.modalClass {
-  .ant-modal-body {
-    height: 4rem !important;
-    overflow-y: scroll !important;
-  }
-
-  .ant-modal-title {
-    font-weight: 600;
-  }
-
-  .ant-modal-content {
-    .ant-modal-header {
-      border-bottom: 0 !important;
+  .wrj {
+    .ant-modal-body {
+      height: 700px !important;
     }
   }
-}
-
-.appModal {
-  .ant-modal-body {
-    height: 4.8rem !important;
-    overflow-y: scroll !important;
-  }
-
-  .ant-modal-title {
-    font-weight: 600;
-  }
-
-  .ant-modal-content {
-    .ant-modal-header {
-      border-bottom: 0 !important;
+  .modalClass {
+    .ant-modal-body {
+      height: 4rem !important;
+      overflow-y: scroll !important;
+    }
+    .ant-modal-title {
+      font-weight: 600;
+    }
+    .ant-modal-content {
+      .ant-modal-header {
+        border-bottom: 0 !important;
+      }
     }
   }
-}
-
-.single-preview-modal {
-  .ant-modal-header {
-    background: url(~@/assets/home/video-background.png) no-repeat;
-    background-size: cover;
+  .appModal {
+    .ant-modal-body {
+      height: 4.8rem !important;
+      overflow-y: scroll !important;
+    }
+    .ant-modal-title {
+      font-weight: 600;
+    }
+    .ant-modal-content {
+      .ant-modal-header {
+        border-bottom: 0 !important;
+      }
+    }
   }
-
-  .ant-modal-title {
-    font-size: 0.16rem;
-    font-weight: 500;
-    color: #ffffff;
+  .single-preview-modal {
+    .ant-modal-header {
+      background: url(~@/assets/home/video-background.png) no-repeat;
+      background-size: cover;
+    }
+    .ant-modal-title {
+      font-size: 0.16rem;
+      font-weight: 500;
+      color: #ffffff;
+    }
+    .anticon {
+      color: #ffffff;
+    }
   }
-
-  .anticon {
-    color: #ffffff;
+  .batch-preview-modal {
+    .batch-video {
+      width: 100%;
+      display: grid;
+      grid-template-columns: 50% 50%;
+      grid-template-rows: 50% 50%;
+      justify-content: center;
+      grid-row-gap: 10px;
+      grid-column-gap: 10px;
+    }
+    .ant-pagination-item-link {
+      background-color: #5580f7;
+    }
+    .ant-modal-header {
+      background: url(~@/assets/home/video-background.png) no-repeat;
+      background-size: cover;
+    }
+    .ant-modal-title {
+      font-size: 0.16rem;
+      font-weight: 500;
+      color: #ffffff;
+    }
+    .anticon {
+      color: #ffffff;
+    }
   }
-}
-
-.batch-preview-modal {
-  .batch-video {
-    width: 100%;
-    display: grid;
-    grid-template-columns: 50% 50%;
-    grid-template-rows: 50% 50%;
-    justify-content: center;
-    grid-row-gap: 10px;
-    grid-column-gap: 10px;
-  }
-
-  .ant-pagination-item-link {
-    background-color: #5580f7;
-  }
-
-  .ant-modal-header {
-    background: url(~@/assets/home/video-background.png) no-repeat;
-    background-size: cover;
-  }
-
-  .ant-modal-title {
-    font-size: 0.16rem;
-    font-weight: 500;
-    color: #ffffff;
-  }
-
-  .anticon {
-    color: #ffffff;
-  }
-}
-
-/*禁用video的controls（要慎重！不要轻易隐藏掉，会导致点击视频不能播放）*/
-video::-webkit-media-controls {
-  display: none !important;
-}
-
-.video-cover {
-  position: absolute;
-  left: 0;
-  top: 0;
-  bottom: 0;
-  right: 0;
-  background: transparent;
-  z-index: 99999999;
-  cursor: pointer;
-}
-
-.batch-video-cover {
-  position: absolute;
-  left: 0;
-  top: 0;
-  background: transparent;
-  height: 288px;
-  z-index: 99999999;
-  width: 512px;
-  margin-top: 14px;
-  cursor: pointer;
-}
-
 </style>
diff --git a/front/src/views/newHome/components/WorkDynamics.vue b/front/src/views/newHome/components/WorkDynamics.vue
index 6013b08d..c2a83e73 100644
--- a/front/src/views/newHome/components/WorkDynamics.vue
+++ b/front/src/views/newHome/components/WorkDynamics.vue
@@ -53,6 +53,10 @@
       <span class="gengduo"></span>
     </div>
     <div class="fixedmount">
+      <div @click="applyResource()">
+        <p></p>
+        <p>资源申请</p>
+      </div>
       <div @click="toView()">
         <p></p>
         <p>需求申请</p>
@@ -255,14 +259,24 @@
   const toView = () => {
     window.open(newpage.href, '_blank')
   }
-  
+  // const toApply = () => {
+  //   window.open(applypage.href, '_blank')
+  // }
   getList()
- 
+  // dataList.value.map((item, index) => {
+  //   dataList.value[index].tupian = tupain.value[index]
+  //   console.log('item', item, dataList.value)
+  // })
   function jumpPage() {
+    // 点击内存入store
+    // store.commit('WorkDynList', {
+    //   selectCardsnum: '组件服务',
+    // })
     console.log(
       '选中===================>',
       store.getters['home/selectCardsnum']
     )
+    // router.push({ path: '/DetailsPageconetent' })
     router.push({
       path: '/WorkDynList',
     })
@@ -301,6 +315,15 @@
   function handlecancelAbilitySquare() {
     abilitySquareFunctionData.value = '智能算法'
   }
+  const applyResource = () => {
+    console.log('点击===============》')
+    router.push({
+      path: '/DetailsPageconetent',
+      query: {
+        select: "基础设施",
+      },
+    })
+  }
 </script>
 <style lang="less">
   .shangjia-class {
@@ -569,10 +592,10 @@
   }
 
   .fixedmount {
-    height: 1.5rem;
+    height: 2.4rem;
     display: flex;
     position: fixed;
-    bottom: 2.56rem;
+    bottom: 1.56rem;
     right: 1.9rem;
     z-index: 10;
     flex-direction: column;
@@ -608,7 +631,8 @@
   .fixedmount div:nth-child(1) p:nth-child(1) {
     height: 0.24rem;
     width: 0.24rem;
-    background: url('~@/assets/home/shenqing.png') no-repeat;
+    //background: url('~@/assets/home/shenqing.png') no-repeat;
+    background: url('~@/assets/newHome/banner-yy.png') no-repeat;
     background-size: contain;
     background-position: center;
   }

From 432ba890f65362c59a19b8bb56f2b9d9f937b6d8 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Mon, 26 Sep 2022 11:32:14 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/DetailsPageconetent.vue | 2304 ++++++++++--------
 front/src/views/home/infrastructurePage.vue  |  673 ++---
 2 files changed, 1681 insertions(+), 1296 deletions(-)

diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index c0069111..68271b96 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -12,32 +12,55 @@
       <div class="resultListSearchInput-father">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            @search="getAppResources2" @change="onSearch" class="resultListSearchInput" />
+          <a-input-search
+            v-model:value="searchValue"
+            placeholder="请输入关键词"
+            enter-button="搜索"
+            size="large"
+            @search="getAppResources2"
+            @change="onSearch"
+            class="resultListSearchInput"
+          />
           <button class="button-reset" @click="chongzhi()">重置</button>
-          <button class="button-reset" style="margin-left: 0.1rem" @click="globalSearch()">
+          <button
+            class="button-reset"
+            style="margin-left: 0.1rem"
+            @click="globalSearch()"
+          >
             全局搜索
           </button>
-          <button v-if="Cardsname == '应用资源'" class="button-reset" @click="applyAll()" style="margin-left: 0.1rem">
+          <button
+            v-if="Cardsname == '应用资源'"
+            class="button-reset"
+            @click="applyAll()"
+            style="margin-left: 0.1rem"
+          >
             全部申请
           </button>
           <div class="hengxian" style="background: transparent"></div>
         </div>
       </div>
       <div class="top-title">
-        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)">
-          <span class="photo" :style="{
-            backgroundImage: `url(${item.photo}) `,
-            backgroundSize: 'cover',
-          }"></span>
+        <div
+          v-for="item in titleName"
+          :key="item.name"
+          :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)"
+        >
+          <span
+            class="photo"
+            :style="{
+              backgroundImage: `url(${item.photo}) `,
+              backgroundSize: 'cover',
+            }"
+          ></span>
           <span v-if="globalData.data.length > 0">
             {{
-            item.name +
-            '(' +
-            (globalData.data.filter((val) => val.type === item.name)[0]
-            .count || '0') +
-            ')'
+              item.name +
+              '(' +
+              (globalData.data.filter((val) => val.type === item.name)[0]
+                .count || '0') +
+              ')'
             }}
           </span>
           <span v-else>
@@ -46,45 +69,89 @@
         </div>
       </div>
       <div class="top-content-father" :key="listKey">
-        <template v-if="
-          Cardsname == '组件服务' ||
-          Cardsname == '应用资源' ||
-          Cardsname == ''
-        ">
+        <template
+          v-if="
+            Cardsname == '组件服务' ||
+            Cardsname == '应用资源' ||
+            Cardsname == ''
+          "
+        >
           <div class="top-content-son">
-            <div v-for="(item, index) in ListContent.records" :key="index" class="top-content">
+            <div
+              v-for="(item, index) in ListContent.records"
+              :key="index"
+              class="top-content"
+            >
               <span class="top-content-title">
                 {{ item.name }}
               </span>
-              <div class="leixingsumfather" :class="!item.shrinkFlag ? 'shrink' : ''">
-                <div v-for="(item2, index2) in item.typeList" :key="index2" class="leixingsum">
-                  <a-checkable-tag :checked="
-                    item.selectedTags &&
-                    item.selectedTags.indexOf(item2.dict_label) !== -1
-                  " @change="
-                    (checked) => handleChange(item2, checked, item.name)
-                  ">
+              <div
+                class="leixingsumfather"
+                :class="!item.shrinkFlag ? 'shrink' : ''"
+              >
+                <div
+                  v-for="(item2, index2) in item.typeList"
+                  :key="index2"
+                  class="leixingsum"
+                >
+                  <a-checkable-tag
+                    :checked="
+                      item.selectedTags &&
+                      item.selectedTags.indexOf(item2.dict_label) !== -1
+                    "
+                    @change="
+                      (checked) => handleChange(item2, checked, item.name)
+                    "
+                  >
                     {{ item2.dict_label }}
                   </a-checkable-tag>
                 </div>
               </div>
-              <div class="shrinkTag" v-if="item.showShrink" :key="item.shrinkFlag">
-                <up-outlined v-show="!item.shrinkFlag" @click="changeShrink(item.name)" />
-                <down-outlined v-show="item.shrinkFlag" @click="changeShrink(item.name)" />
+              <div
+                class="shrinkTag"
+                v-if="item.showShrink"
+                :key="item.shrinkFlag"
+              >
+                <up-outlined
+                  v-show="!item.shrinkFlag"
+                  @click="changeShrink(item.name)"
+                />
+                <down-outlined
+                  v-show="item.shrinkFlag"
+                  @click="changeShrink(item.name)"
+                />
               </div>
             </div>
           </div>
         </template>
       </div>
-      <searchResultList v-show="resourceList.data && resourceList.data.length > 0" :resourceList="resourceList"
-        :key="listKey2" :resourceTotal="resourceTotal" :select-cardsname="Cardsname"
-        @saveSearchCodition="saveSearchCodition" ref="searchResultListDom" />
+      <searchResultList
+        v-show="resourceList.data && resourceList.data.length > 0"
+        :resourceList="resourceList"
+        :key="listKey2"
+        :resourceTotal="resourceTotal"
+        :select-cardsname="Cardsname"
+        @saveSearchCodition="saveSearchCodition"
+        ref="searchResultListDom"
+      />
       <div class="pagination">
-        <a-pagination v-if="resourceList.data && resourceList.data.length > 0" v-model:current="currentPage"
-          v-model:pageSize="currentPageSize" show-size-changer show-less-items show-quick-jumper :total="resourceTotal"
-          :page-size-options="pageSizeOptions" @change="pageChange" @showSizeChange="onShowSizeChange" />
+        <a-pagination
+          v-if="resourceList.data && resourceList.data.length > 0"
+          v-model:current="currentPage"
+          v-model:pageSize="currentPageSize"
+          show-size-changer
+          show-less-items
+          show-quick-jumper
+          :total="resourceTotal"
+          :page-size-options="pageSizeOptions"
+          @change="pageChange"
+          @showSizeChange="onShowSizeChange"
+        />
       </div>
-      <div v-if="resourceList.data && resourceList.data.length <= 0" style="margin-top: 2rem">
+      <div
+        v-if="resourceList.data && resourceList.data.length <= 0"
+        style="margin-top: 2rem"
+      >
         <a-empty />
       </div>
     </div>
@@ -92,29 +159,47 @@
       <div class="resultListSearchInput-father">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            @search="getAppResources2" @change="onSearch" class="resultListSearchInput" />
+          <a-input-search
+            v-model:value="searchValue"
+            placeholder="请输入关键词"
+            enter-button="搜索"
+            size="large"
+            @search="getAppResources2"
+            @change="onSearch"
+            class="resultListSearchInput"
+          />
           <button class="button-reset" @click="chongzhi()">重置</button>
-          <button class="button-reset" style="margin-left: 0.1rem" @click="globalSearch()">
+          <button
+            class="button-reset"
+            style="margin-left: 0.1rem"
+            @click="globalSearch()"
+          >
             全局搜索
           </button>
           <div class="hengxian" style="background: transparent"></div>
         </div>
       </div>
       <div class="top-title">
-        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)">
-          <span class="photo" :style="{
-            backgroundImage: `url(${item.photo}) `,
-            backgroundSize: 'cover',
-          }"></span>
+        <div
+          v-for="item in titleName"
+          :key="item.name"
+          :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)"
+        >
+          <span
+            class="photo"
+            :style="{
+              backgroundImage: `url(${item.photo}) `,
+              backgroundSize: 'cover',
+            }"
+          ></span>
           <span v-if="globalData.data.length > 0">
             {{
-            item.name +
-            '(' +
-            (globalData.data.filter((val) => val.type === item.name)[0]
-            .count || '0') +
-            ')'
+              item.name +
+              '(' +
+              (globalData.data.filter((val) => val.type === item.name)[0]
+                .count || '0') +
+              ')'
             }}
           </span>
           <span v-else>
@@ -123,36 +208,58 @@
         </div>
       </div>
       <div class="top-content-father">
-        <infrastructurePage ref="camera" @add="handleAdd" :searchValue="searchValue" />
+        <infrastructurePage
+          ref="camera"
+          @add="handleAdd"
+          :searchValue="searchValue"
+        />
       </div>
     </div>
     <div class="top" v-else>
       <div class="resultListSearchInput-father">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            @search="getAppResources2" @change="onSearch" class="resultListSearchInput" />
+          <a-input-search
+            v-model:value="searchValue"
+            placeholder="请输入关键词"
+            enter-button="搜索"
+            size="large"
+            @search="getAppResources2"
+            @change="onSearch"
+            class="resultListSearchInput"
+          />
           <button class="button-reset" @click="chongzhi()">重置</button>
-          <button class="button-reset" style="margin-left: 0.1rem" @click="globalSearch()">
+          <button
+            class="button-reset"
+            style="margin-left: 0.1rem"
+            @click="globalSearch()"
+          >
             全局搜索
           </button>
           <div class="hengxian" style="background: transparent"></div>
         </div>
       </div>
       <div class="top-title">
-        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)">
-          <span class="photo" :style="{
-            backgroundImage: `url(${item.photo}) `,
-            backgroundSize: 'cover',
-          }"></span>
+        <div
+          v-for="item in titleName"
+          :key="item.name"
+          :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)"
+        >
+          <span
+            class="photo"
+            :style="{
+              backgroundImage: `url(${item.photo}) `,
+              backgroundSize: 'cover',
+            }"
+          ></span>
           <span v-if="globalData.data.length > 0">
             {{
-            item.name +
-            '(' +
-            (globalData.data.filter((val) => val.type === item.name)[0]
-            .count || '0') +
-            ')'
+              item.name +
+              '(' +
+              (globalData.data.filter((val) => val.type === item.name)[0]
+                .count || '0') +
+              ')'
             }}
           </span>
           <span v-else>
@@ -160,7 +267,10 @@
           </span>
         </div>
       </div>
-      <KnowledgeBase :resourceList="resourceList" :resourceTotal="resourceTotal"></KnowledgeBase>
+      <KnowledgeBase
+        :resourceList="resourceList"
+        :resourceTotal="resourceTotal"
+      ></KnowledgeBase>
     </div>
     <div class="talk-monitor" @click="openMonitor">
       <a-tooltip>
@@ -172,14 +282,21 @@
       <p></p>
       <p>能力广场</p>
       <ul v-show="visibleAbilitySquare">
-        <li v-for="item in abilitySquare" :key="item" @click="abilitySquareFunction(item)">
+        <li
+          v-for="item in abilitySquare"
+          :key="item"
+          @click="abilitySquareFunction(item)"
+        >
           {{ item }}
         </li>
       </ul>
     </div>
   </div>
   <!-- 西海岸 -->
-  <div class="details-pageconetent" v-else-if="whoShow1 && whoShow1.itShowXiHaiAn">
+  <div
+    class="details-pageconetent"
+    v-else-if="whoShow1 && whoShow1.itShowXiHaiAn"
+  >
     <home-header></home-header>
     <div class="details-pageconetent-left" v-if="Cardsname != '基础设施'">
       <detailsPageconetentTree />
@@ -189,75 +306,140 @@
     </div>
     <div class="top" v-if="Cardsname != '知识库' && Cardsname != '基础设施'">
       <div class="top-title">
-        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)">
-          <span class="photo" :style="{
-            backgroundImage: `url(${item.photo}) `,
-            backgroundSize: 'cover',
-          }"></span>
+        <div
+          v-for="item in titleName"
+          :key="item.name"
+          :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)"
+        >
+          <span
+            class="photo"
+            :style="{
+              backgroundImage: `url(${item.photo}) `,
+              backgroundSize: 'cover',
+            }"
+          ></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
       <div class="resultListSearchInput-father">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            @search="getAppResources" @change="onSearch" class="resultListSearchInput" />
+          <a-input-search
+            v-model:value="searchValue"
+            placeholder="请输入关键词"
+            enter-button="搜索"
+            size="large"
+            @search="getAppResources"
+            @change="onSearch"
+            class="resultListSearchInput"
+          />
           <button class="button-reset" @click="chongzhi()">重置</button>
           <div class="hengxian"></div>
         </div>
       </div>
       <div class="top-content-father" :key="listKey">
-        <template v-if="
-          Cardsname == '组件服务' ||
-          Cardsname == '应用资源' ||
-          Cardsname == ''
-        ">
+        <template
+          v-if="
+            Cardsname == '组件服务' ||
+            Cardsname == '应用资源' ||
+            Cardsname == ''
+          "
+        >
           <div class="top-content-son">
-            <div v-for="(item, index) in ListContent.records" :key="index" class="top-content">
+            <div
+              v-for="(item, index) in ListContent.records"
+              :key="index"
+              class="top-content"
+            >
               <span class="top-content-title">
                 {{ item.name }}
               </span>
-              <div class="leixingsumfather" :class="!item.shrinkFlag ? 'shrink' : ''">
-                <div v-for="(item2, index2) in item.typeList" :key="index2" class="leixingsum">
-                  <a-checkable-tag :checked="
-                    item.selectedTags &&
-                    item.selectedTags.indexOf(item2.dict_label) !== -1
-                  " @change="
-                    (checked) => handleChange(item2, checked, item.name)
-                  ">
+              <div
+                class="leixingsumfather"
+                :class="!item.shrinkFlag ? 'shrink' : ''"
+              >
+                <div
+                  v-for="(item2, index2) in item.typeList"
+                  :key="index2"
+                  class="leixingsum"
+                >
+                  <a-checkable-tag
+                    :checked="
+                      item.selectedTags &&
+                      item.selectedTags.indexOf(item2.dict_label) !== -1
+                    "
+                    @change="
+                      (checked) => handleChange(item2, checked, item.name)
+                    "
+                  >
                     {{ item2.dict_label }}
                   </a-checkable-tag>
                 </div>
               </div>
-              <div class="shrinkTag" v-if="item.showShrink" :key="item.shrinkFlag">
-                <up-outlined v-show="!item.shrinkFlag" @click="changeShrink(item.name)" />
-                <down-outlined v-show="item.shrinkFlag" @click="changeShrink(item.name)" />
+              <div
+                class="shrinkTag"
+                v-if="item.showShrink"
+                :key="item.shrinkFlag"
+              >
+                <up-outlined
+                  v-show="!item.shrinkFlag"
+                  @click="changeShrink(item.name)"
+                />
+                <down-outlined
+                  v-show="item.shrinkFlag"
+                  @click="changeShrink(item.name)"
+                />
               </div>
             </div>
           </div>
         </template>
       </div>
-      <searchResultList v-show="resourceList.data && resourceList.data.length > 0" :key="listKey2"
-        :resourceList="resourceList" :resourceTotal="resourceTotal" :select-cardsname="Cardsname"
-        @saveSearchCodition="saveSearchCodition" ref="searchResultListDom" />
+      <searchResultList
+        v-show="resourceList.data && resourceList.data.length > 0"
+        :key="listKey2"
+        :resourceList="resourceList"
+        :resourceTotal="resourceTotal"
+        :select-cardsname="Cardsname"
+        @saveSearchCodition="saveSearchCodition"
+        ref="searchResultListDom"
+      />
       <div class="pagination">
-        <a-pagination v-if="resourceList.data && resourceList.data.length > 0" v-model:current="currentPage"
-          v-model:pageSize="currentPageSize" show-size-changer show-less-items show-quick-jumper :total="resourceTotal"
-          :page-size-options="pageSizeOptions" @change="pageChange" @showSizeChange="onShowSizeChange" />
+        <a-pagination
+          v-if="resourceList.data && resourceList.data.length > 0"
+          v-model:current="currentPage"
+          v-model:pageSize="currentPageSize"
+          show-size-changer
+          show-less-items
+          show-quick-jumper
+          :total="resourceTotal"
+          :page-size-options="pageSizeOptions"
+          @change="pageChange"
+          @showSizeChange="onShowSizeChange"
+        />
       </div>
-      <div v-if="resourceList.data && resourceList.data.length <= 0" style="margin-top: 2rem">
+      <div
+        v-if="resourceList.data && resourceList.data.length <= 0"
+        style="margin-top: 2rem"
+      >
         <a-empty />
       </div>
     </div>
     <div class="top" v-else-if="Cardsname === '基础设施'">
       <div class="top-title">
-        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)">
-          <span class="photo" :style="{
-            backgroundImage: `url(${item.photo}) `,
-            backgroundSize: 'cover',
-          }"></span>
+        <div
+          v-for="item in titleName"
+          :key="item.name"
+          :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)"
+        >
+          <span
+            class="photo"
+            :style="{
+              backgroundImage: `url(${item.photo}) `,
+              backgroundSize: 'cover',
+            }"
+          ></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
@@ -267,24 +449,41 @@
     </div>
     <div class="top" v-else>
       <div class="top-title">
-        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)">
-          <span class="photo" :style="{
-            backgroundImage: `url(${item.photo}) `,
-            backgroundSize: 'cover',
-          }"></span>
+        <div
+          v-for="item in titleName"
+          :key="item.name"
+          :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)"
+        >
+          <span
+            class="photo"
+            :style="{
+              backgroundImage: `url(${item.photo}) `,
+              backgroundSize: 'cover',
+            }"
+          ></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
       <div class="resultListSearchInput-father" style="background: unset">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            @search="getAppResources" @change="onSearch" class="resultListSearchInput" />
+          <a-input-search
+            v-model:value="searchValue"
+            placeholder="请输入关键词"
+            enter-button="搜索"
+            size="large"
+            @search="getAppResources"
+            @change="onSearch"
+            class="resultListSearchInput"
+          />
           <button class="button-reset" @click="chongzhi()">重置</button>
         </div>
       </div>
-      <KnowledgeBase :resourceList="resourceList" :resourceTotal="resourceTotal"></KnowledgeBase>
+      <KnowledgeBase
+        :resourceList="resourceList"
+        :resourceTotal="resourceTotal"
+      ></KnowledgeBase>
     </div>
     <div class="talk-monitor" @click="openMonitor">
       <a-tooltip>
@@ -294,75 +493,139 @@
     </div>
   </div>
   <!-- 包头 -->
-  <div class="details-pageconetent" v-else-if="whoShow1 && whoShow1.itShowBaoTou">
+  <div
+    class="details-pageconetent"
+    v-else-if="whoShow1 && whoShow1.itShowBaoTou"
+  >
     <home-header></home-header>
     <div class="details-pageconetent-left">
       <detailsPageconetentTree />
     </div>
     <div class="top" v-if="Cardsname != '知识库' && Cardsname != '数据资源'">
       <div class="top-title">
-        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)">
-          <span class="photo" :style="{
-            backgroundImage: `url(${item.photo}) `,
-            backgroundSize: 'cover',
-          }"></span>
+        <div
+          v-for="item in titleName"
+          :key="item.name"
+          :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)"
+        >
+          <span
+            class="photo"
+            :style="{
+              backgroundImage: `url(${item.photo}) `,
+              backgroundSize: 'cover',
+            }"
+          ></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
-      <div v-show="Cardsname !== '数据资源'" class="resultListSearchInput-father">
+      <div
+        v-show="Cardsname !== '数据资源'"
+        class="resultListSearchInput-father"
+      >
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            @search="getAppResources" @change="onSearch" class="resultListSearchInput" />
+          <a-input-search
+            v-model:value="searchValue"
+            placeholder="请输入关键词"
+            enter-button="搜索"
+            size="large"
+            @search="getAppResources"
+            @change="onSearch"
+            class="resultListSearchInput"
+          />
           <button class="button-reset" @click="chongzhi()">重置</button>
           <div class="hengxian"></div>
         </div>
       </div>
       <div class="top-content-father" :key="listKey">
-        <template v-if="
-          Cardsname == '组件服务' ||
-          Cardsname == '应用资源' ||
-          Cardsname == ''
-        ">
+        <template
+          v-if="
+            Cardsname == '组件服务' ||
+            Cardsname == '应用资源' ||
+            Cardsname == ''
+          "
+        >
           <div class="top-content-son">
-            <div v-for="(item, index) in ListContent.records" :key="index" class="top-content">
+            <div
+              v-for="(item, index) in ListContent.records"
+              :key="index"
+              class="top-content"
+            >
               <span class="top-content-title">
                 {{ item.name }}
               </span>
-              <div class="leixingsumfather" :class="!item.shrinkFlag ? 'shrink' : ''">
-                <div v-for="(item2, index2) in item.typeList" :key="index2" class="leixingsum">
-                  <a-checkable-tag :checked="
-                    item.selectedTags &&
-                    item.selectedTags.indexOf(item2.dict_label) !== -1
-                  " @change="
-                    (checked) => handleChange(item2, checked, item.name)
-                  ">
+              <div
+                class="leixingsumfather"
+                :class="!item.shrinkFlag ? 'shrink' : ''"
+              >
+                <div
+                  v-for="(item2, index2) in item.typeList"
+                  :key="index2"
+                  class="leixingsum"
+                >
+                  <a-checkable-tag
+                    :checked="
+                      item.selectedTags &&
+                      item.selectedTags.indexOf(item2.dict_label) !== -1
+                    "
+                    @change="
+                      (checked) => handleChange(item2, checked, item.name)
+                    "
+                  >
                     {{ item2.dict_label }}
                   </a-checkable-tag>
                 </div>
               </div>
-              <div class="shrinkTag" v-if="item.showShrink" :key="item.shrinkFlag">
-                <up-outlined v-show="!item.shrinkFlag" @click="changeShrink(item.name)" />
-                <down-outlined v-show="item.shrinkFlag" @click="changeShrink(item.name)" />
+              <div
+                class="shrinkTag"
+                v-if="item.showShrink"
+                :key="item.shrinkFlag"
+              >
+                <up-outlined
+                  v-show="!item.shrinkFlag"
+                  @click="changeShrink(item.name)"
+                />
+                <down-outlined
+                  v-show="item.shrinkFlag"
+                  @click="changeShrink(item.name)"
+                />
               </div>
             </div>
           </div>
         </template>
       </div>
-      <searchResultList v-show="resourceList.data && resourceList.data.length" :key="listKey2"
-        :resourceList="resourceList" :resourceTotal="resourceTotal" :select-cardsname="Cardsname"
-        @saveSearchCodition="saveSearchCodition" ref="searchResultListDom" />
+      <searchResultList
+        v-show="resourceList.data && resourceList.data.length"
+        :key="listKey2"
+        :resourceList="resourceList"
+        :resourceTotal="resourceTotal"
+        :select-cardsname="Cardsname"
+        @saveSearchCodition="saveSearchCodition"
+        ref="searchResultListDom"
+      />
       <div class="pagination">
-        <a-pagination v-if="resourceList.data && resourceList.data.length > 0" v-model:current="currentPage"
-          v-model:pageSize="currentPageSize" show-size-changer show-less-items show-quick-jumper :total="resourceTotal"
-          :page-size-options="pageSizeOptions" @change="pageChange" @showSizeChange="onShowSizeChange" />
+        <a-pagination
+          v-if="resourceList.data && resourceList.data.length > 0"
+          v-model:current="currentPage"
+          v-model:pageSize="currentPageSize"
+          show-size-changer
+          show-less-items
+          show-quick-jumper
+          :total="resourceTotal"
+          :page-size-options="pageSizeOptions"
+          @change="pageChange"
+          @showSizeChange="onShowSizeChange"
+        />
       </div>
       <div class="shujuziyuan" v-if="Cardsname == '数据资源'">
         <div class="yunziyuan">
           <div class="yunziyuan-title">
             <div class="tupian"></div>
-            <div class="title" @click="dianjitiaozhaun('青岛市政务资源管理平台')">
+            <div
+              class="title"
+              @click="dianjitiaozhaun('青岛市政务资源管理平台')"
+            >
               青岛市政务资源管理平台{{ dataShowdev }}
             </div>
           </div>
@@ -378,18 +641,28 @@
           </div>
         </div>
       </div>
-      <div v-if="resourceList.data && resourceList.data.length <= 0" style="margin-top: 2rem">
+      <div
+        v-if="resourceList.data && resourceList.data.length <= 0"
+        style="margin-top: 2rem"
+      >
         <a-empty v-if="!(Cardsname == '数据资源')" />
       </div>
     </div>
     <div class="top" v-else-if="Cardsname == '数据资源'">
       <div class="top-title">
-        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)">
-          <span class="photo" :style="{
-            backgroundImage: `url(${item.photo}) `,
-            backgroundSize: 'cover',
-          }"></span>
+        <div
+          v-for="item in titleName"
+          :key="item.name"
+          :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)"
+        >
+          <span
+            class="photo"
+            :style="{
+              backgroundImage: `url(${item.photo}) `,
+              backgroundSize: 'cover',
+            }"
+          ></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
@@ -397,489 +670,625 @@
     </div>
     <div class="top" v-else>
       <div class="top-title">
-        <div v-for="item in titleName" :key="item.name" :class="item.name === Cardsname ? 'sel' : ''"
-          @click="changeCards(item.name)">
-          <span class="photo" :style="{
-            backgroundImage: `url(${item.photo}) `,
-            backgroundSize: 'cover',
-          }"></span>
+        <div
+          v-for="item in titleName"
+          :key="item.name"
+          :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)"
+        >
+          <span
+            class="photo"
+            :style="{
+              backgroundImage: `url(${item.photo}) `,
+              backgroundSize: 'cover',
+            }"
+          ></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
       <div class="resultListSearchInput-father" style="background: unset">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            @search="getAppResources" @change="onSearch" class="resultListSearchInput" />
+          <a-input-search
+            v-model:value="searchValue"
+            placeholder="请输入关键词"
+            enter-button="搜索"
+            size="large"
+            @search="getAppResources"
+            @change="onSearch"
+            class="resultListSearchInput"
+          />
           <button class="button-reset" @click="chongzhi()">重置</button>
         </div>
       </div>
-      <KnowledgeBase :resourceList="resourceList" :resourceTotal="resourceTotal"></KnowledgeBase>
+      <KnowledgeBase
+        :resourceList="resourceList"
+        :resourceTotal="resourceTotal"
+      ></KnowledgeBase>
     </div>
   </div>
   <home-footer></home-footer>
 </template>
 <script>
-import HomeFooter from '@/views/newHome/components/Footer'
-import mybus from '@/myplugins/mybus'
-import { defineComponent, reactive, ref, toRefs, onMounted, watch, nextTick } from 'vue'
-import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
-import {
-  selectDicStoreAll,
-  pageWithAttrs,
-  getDataResource,
-  getCountByFuzzyQuery,
-} from '@/api/home.js'
-import { getSgcList } from '@/api/personalCenter'
-import { useRouter } from 'vue-router'
-import HomeHeader from '@/views/home/components/header'
-import detailsPageconetentTree from '@/views/home/detailsPageconetentTree.vue'
-import searchResultList from '@/views/home/components/searchResultList.vue'
-import KnowledgeBase from '@/views/home/components/KnowledgeBase.vue'
-// 数据资源引用
-import DetailsPageResource from '@/views/home/components/DetailsPageResource.vue'
-// 基础设施引用
-import infrastructurePage from '@/views/home/infrastructurePage.vue'
-import detailsPageInfrastructureTree from '@/views/home/detailsPageInfrastructureTree.vue'
+  import HomeFooter from '@/views/newHome/components/Footer'
+  import mybus from '@/myplugins/mybus'
+  import {
+    defineComponent,
+    reactive,
+    ref,
+    toRefs,
+    onMounted,
+    watch,
+    nextTick,
+  } from 'vue'
+  import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
+  import {
+    selectDicStoreAll,
+    pageWithAttrs,
+    getDataResource,
+    getCountByFuzzyQuery,
+  } from '@/api/home.js'
+  import { getSgcList } from '@/api/personalCenter'
+  import { useRouter } from 'vue-router'
+  import HomeHeader from '@/views/home/components/header'
+  import detailsPageconetentTree from '@/views/home/detailsPageconetentTree.vue'
+  import searchResultList from '@/views/home/components/searchResultList.vue'
+  import KnowledgeBase from '@/views/home/components/KnowledgeBase.vue'
+  // 数据资源引用
+  import DetailsPageResource from '@/views/home/components/DetailsPageResource.vue'
+  // 基础设施引用
+  import infrastructurePage from '@/views/home/infrastructurePage.vue'
+  import detailsPageInfrastructureTree from '@/views/home/detailsPageInfrastructureTree.vue'
 
-import { message } from 'ant-design-vue'
-import {
-  titleNameArray,
-  keyongziyuanqingkaungArray,
-  shujuziyuanqingkuangArray,
-} from './constantData/showData.js'
+  import { message } from 'ant-design-vue'
+  import {
+    titleNameArray,
+    keyongziyuanqingkaungArray,
+    shujuziyuanqingkuangArray,
+  } from './constantData/showData.js'
 
-export default defineComponent({
-  beforeRouteLeave(to, from, next) {
-    console.log('to---DetailsPageconetent--beforeRouteLeave------->', to)
-    console.log('from---DetailsPageconetent--beforeRouteLeave------->', from)
-    console.log('next---DetailsPageconetent--beforeRouteLeave------->', next)
-    if (to.name !== 'details') {
-      localStorage.removeItem('DetailsPageconetent')
-    }
-    next()
-  },
-  setup() {
-    //会议室传的标识6
-    const flag = ref('')
-    let componentTypeArray = ['组件类型', '应用领域']
-    const handleAdd = (value) => {
-      flag.value = value
-    }
-    const titleName = ref(titleNameArray)
-
-    const openMonitor = () => {
-      window.open('http://www.qingdao.gov.cn:8083/ghwd/znwdqd/index.html')
-    }
-    // 模糊查询
-    const keyongziyuanqingkaung = ref(keyongziyuanqingkaungArray)
-    const shujuziyuanqingkuang = ref(shujuziyuanqingkuangArray)
-
-    // 青岛数据资源页
-    const whoShow1 = ref(whoShow)
-    // 分页
-    const loading = ref(true)
-    let currentPage = ref(1)
-    let currentPageSize = ref(5)
-    const pageSizeOptions = ref(['5', '10', '20', '50'])
-    const router = useRouter()
-    let select = router.currentRoute.value.query.select || '应用资源'
-    const select2 = router.currentRoute.value.query.select
-    const str = router.currentRoute.value.query.str
-    const searchValue = ref(str)
-    let tecHnosphere = router.currentRoute.value.query.tecHnosphere
-    let appLiCation = router.currentRoute.value.query.appLiCation
-    const Cardsname = ref(select)
-    // 刷新筛选条件组件
-    let listKey = ref(0)
-    // 刷新筛选列表信息组件
-    const listKey2 = ref(0)
-    // 储存筛选条件状态
-    const state = reactive({
-      selectedTags: [],
-      diyici: [],
-    })
-    // 查询参数
-    let paramsGetResources = {
-      districtId: '',
-      deptIds: [],
-      pageNum: 1,
-      pageSize: currentPageSize.value,
-      type: Cardsname.value,
-      name: '',
-      infoList: [],
-      orderField: '', // 传空为默认排序 total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
-      orderType: 'DESC', // ASC 升序  DESC 降序
-    }
-
-    const searchResultListDom = ref(null)
-
-    // 读取本地存储查询条件
-    let storageSearchInfo = null
-    const handleSetSearchData = () => {
-      if (whoShow1.value.itShowXiHaiAn) {
-        if (localStorage.getItem('DetailsPageconetent')) {
-          storageSearchInfo = JSON.parse(localStorage.getItem('DetailsPageconetent'));
-        }
-        console.log('storageSearchInfo------------>', storageSearchInfo)
-        // 读取本地存储：表单赋值
-        if (storageSearchInfo) {
-          paramsGetResources = Object.assign({}, paramsGetResources, storageSearchInfo)
-          // 搜索名称
-          searchValue.value = storageSearchInfo.name;
-          currentPage.value = storageSearchInfo.pageNum;
-          currentPageSize.value = storageSearchInfo.pageSize;
-          paramsGetResources.pageNum = storageSearchInfo.pageNum;
-          paramsGetResources.pageSize = storageSearchInfo.pageSize;
-          paramsGetResources.deptIds = storageSearchInfo.deptIds;
-          paramsGetResources.districtId = storageSearchInfo.districtId;
-
-          // 延迟使用，因为还没有返回跟挂载
-          nextTick(() => {
-            searchResultListDom.value.changeCondition({
-              value: storageSearchInfo.orderField,
-              orderType: storageSearchInfo.orderType,
-            }, true)
-          })
-        }
+  export default defineComponent({
+    beforeRouteLeave(to, from, next) {
+      console.log('to---DetailsPageconetent--beforeRouteLeave------->', to)
+      console.log('from---DetailsPageconetent--beforeRouteLeave------->', from)
+      console.log('next---DetailsPageconetent--beforeRouteLeave------->', next)
+      if (to.name !== 'details') {
+        localStorage.removeItem('DetailsPageconetent')
       }
-    }
-
-    //西海岸查询参数
-    let paramsGetResources2 = ref({
-      regionId: '70be8c5b664f4bcf869d82f2e8335051',
-      pageNum: 1,
-      pageSize: currentPageSize.value,
-      name: '',
-    })
-    // 查询
-    const onSearch = () => {
-      loading.value = true
-      paramsGetResources.name = searchValue.value
-      currentPage.value = 1
-    }
-    // 免批
-    const tagFlag = ref('')
-    const current = ref(5)
-    const chagneTag = (name) => {
-      console.log('name------------>', name)
-      paramsGetResources.pageNum = 1
-      currentPage.value = 1
-      if (tagFlag.value == name) {
-        tagFlag.value = ''
-        paramsGetResources.shareCondition = ''
-      } else {
-        tagFlag.value = name
-        paramsGetResources.shareCondition = name
+      next()
+    },
+    setup() {
+      //会议室传的标识6
+      const flag = ref('')
+      let componentTypeArray = ['组件类型', '应用领域']
+      const handleAdd = (value) => {
+        flag.value = value
       }
-      listKey.value++
-      getAppResources()
-      console.log('paramsGetResources-----chagneTag------->', paramsGetResources);
-    }
+      const titleName = ref(titleNameArray)
 
-    // 重置数据
-    const chongzhi = (flag) => {
-      loading.value = true
-      // 重置模糊查字段
-      if (!flag) {
-        searchValue.value = ''
-        globalFlag.value = false
-        globalData.data = []
+      const openMonitor = () => {
+        window.open('http://www.qingdao.gov.cn:8083/ghwd/znwdqd/index.html')
       }
-      paramsGetResources.name = searchValue.value
-      // 重置筛选条件
-      ListContent.records.forEach((val) => {
-        val.selectedTags = []
-      })
+      // 模糊查询
+      const keyongziyuanqingkaung = ref(keyongziyuanqingkaungArray)
+      const shujuziyuanqingkuang = ref(shujuziyuanqingkuangArray)
+
+      // 青岛数据资源页
+      const whoShow1 = ref(whoShow)
       // 分页
-      currentPage.value = 1
-      currentPageSize.value = 5
-      // 重置查询条件
-      paramsGetResources2.value = {
+      const loading = ref(true)
+      let currentPage = ref(1)
+      let currentPageSize = ref(5)
+      const pageSizeOptions = ref(['5', '10', '20', '50'])
+      const router = useRouter()
+      let select = router.currentRoute.value.query.select || '应用资源'
+      const select2 = router.currentRoute.value.query.select
+      const str = router.currentRoute.value.query.str
+      const searchValue = ref(str)
+      let tecHnosphere = router.currentRoute.value.query.tecHnosphere
+      let appLiCation = router.currentRoute.value.query.appLiCation
+      const Cardsname = ref(select)
+      // 刷新筛选条件组件
+      let listKey = ref(0)
+      // 刷新筛选列表信息组件
+      const listKey2 = ref(0)
+      // 储存筛选条件状态
+      const state = reactive({
+        selectedTags: [],
+        diyici: [],
+      })
+      // 查询参数
+      let paramsGetResources = {
+        districtId: '',
+        deptIds: [],
+        pageNum: 1,
+        pageSize: currentPageSize.value,
+        type: Cardsname.value,
+        name: '',
+        infoList: [],
+        orderField: '', // 传空为默认排序 total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
+        orderType: 'DESC', // ASC 升序  DESC 降序
+      }
+
+      const searchResultListDom = ref(null)
+
+      // 读取本地存储查询条件
+      let storageSearchInfo = null
+      const handleSetSearchData = () => {
+        if (whoShow1.value.itShowXiHaiAn) {
+          if (localStorage.getItem('DetailsPageconetent')) {
+            storageSearchInfo = JSON.parse(
+              localStorage.getItem('DetailsPageconetent')
+            )
+          }
+          console.log('storageSearchInfo------------>', storageSearchInfo)
+          // 读取本地存储：表单赋值
+          if (storageSearchInfo) {
+            paramsGetResources = Object.assign(
+              {},
+              paramsGetResources,
+              storageSearchInfo
+            )
+            // 搜索名称
+            searchValue.value = storageSearchInfo.name
+            currentPage.value = storageSearchInfo.pageNum
+            currentPageSize.value = storageSearchInfo.pageSize
+            paramsGetResources.pageNum = storageSearchInfo.pageNum
+            paramsGetResources.pageSize = storageSearchInfo.pageSize
+            paramsGetResources.deptIds = storageSearchInfo.deptIds
+            paramsGetResources.districtId = storageSearchInfo.districtId
+
+            // 延迟使用，因为还没有返回跟挂载
+            nextTick(() => {
+              searchResultListDom.value.changeCondition(
+                {
+                  value: storageSearchInfo.orderField,
+                  orderType: storageSearchInfo.orderType,
+                },
+                true
+              )
+            })
+          }
+        }
+      }
+
+      //西海岸查询参数
+      let paramsGetResources2 = ref({
         regionId: '70be8c5b664f4bcf869d82f2e8335051',
         pageNum: 1,
         pageSize: currentPageSize.value,
         name: '',
+      })
+      // 查询
+      const onSearch = () => {
+        loading.value = true
+        paramsGetResources.name = searchValue.value
+        currentPage.value = 1
       }
-      paramsGetResources.districtId = ''
-      paramsGetResources.deptIds = []
-      paramsGetResources.pageNum = 1
-      paramsGetResources.pageSize = 5
-      paramsGetResources.name = ''
-      paramsGetResources.shareCondition = ''
-      paramsGetResources.infoList = []
-      paramsGetResources.orderField = ''
-      paramsGetResources.orderType = 'DESC'
-      mybus.emit('chongzhi')
-      console.log('paramsGetResources---chongzhi-重置-------->', paramsGetResources);
-      getAppResources()
-    }
-
-    //跳转链接
-    function dianjitiaozhaun(name) {
-      switch (name) {
-        case '青岛市政务资源管理平台':
-          window.open('http://15.72.158.81/web/root/homepage.aspx')
-          console.log('name', name)
-          break
-        case '青岛市视频资源管理平台':
-          window.open('http://15.72.183.88:8760/yzy/main')
-          console.log('name', name)
-          break
-      }
-    }
-
-    // 点击筛选条件回调
-    const handleChange = (tag, checked, name) => {
-      loading.value = true
-      paramsGetResources.pageNum = 1
-      currentPage.value = 1
-      console.log('点击筛选条件=================>', tag, checked, name)
-
-      // 西海岸-智能算法 特殊处理
-      if (whoShow1.value.itShowXiHaiAn) {
-        if (tag.dict_label == '智能算法' && checked) {
-          if(ListContentCopy.value[2]) {
-            ListContent.records.splice(2, 1, ListContentCopy.value[2])
-          }
+      // 免批
+      const tagFlag = ref('')
+      const current = ref(5)
+      const chagneTag = (name) => {
+        console.log('name------------>', name)
+        paramsGetResources.pageNum = 1
+        currentPage.value = 1
+        if (tagFlag.value == name) {
+          tagFlag.value = ''
+          paramsGetResources.shareCondition = ''
         } else {
-          if (name == '组件类型') {
-            ListContent.records.splice(2, 1)
-            paramsGetResources.infoList = paramsGetResources.infoList.filter(
-              (item) => componentTypeArray.includes(item.attrType)
-            )
-          }
+          tagFlag.value = name
+          paramsGetResources.shareCondition = name
+        }
+        listKey.value++
+        getAppResources()
+        console.log(
+          'paramsGetResources-----chagneTag------->',
+          paramsGetResources
+        )
+      }
+
+      // 重置数据
+      const chongzhi = (flag) => {
+        loading.value = true
+        // 重置模糊查字段
+        if (!flag) {
+          searchValue.value = ''
+          globalFlag.value = false
+          globalData.data = []
+        }
+        paramsGetResources.name = searchValue.value
+        // 重置筛选条件
+        ListContent.records.forEach((val) => {
+          val.selectedTags = []
+        })
+        // 分页
+        currentPage.value = 1
+        currentPageSize.value = 5
+        // 重置查询条件
+        paramsGetResources2.value = {
+          regionId: '70be8c5b664f4bcf869d82f2e8335051',
+          pageNum: 1,
+          pageSize: currentPageSize.value,
+          name: '',
+        }
+        paramsGetResources.districtId = ''
+        paramsGetResources.deptIds = []
+        paramsGetResources.pageNum = 1
+        paramsGetResources.pageSize = 5
+        paramsGetResources.name = ''
+        paramsGetResources.shareCondition = ''
+        paramsGetResources.infoList = []
+        paramsGetResources.orderField = ''
+        paramsGetResources.orderType = 'DESC'
+        mybus.emit('chongzhi')
+        console.log(
+          'paramsGetResources---chongzhi-重置-------->',
+          paramsGetResources
+        )
+        getAppResources()
+      }
+
+      //跳转链接
+      function dianjitiaozhaun(name) {
+        switch (name) {
+          case '青岛市政务资源管理平台':
+            window.open('http://15.72.158.81/web/root/homepage.aspx')
+            console.log('name', name)
+            break
+          case '青岛市视频资源管理平台':
+            window.open('http://15.72.183.88:8760/yzy/main')
+            console.log('name', name)
+            break
         }
       }
 
-      ListContent.records.forEach((val) => {
-        if (!val) {
-          return;
-        }
-        if (val.name === name) {
-          paramsGetResources.infoList = paramsGetResources.infoList.filter(
-            (item) => item.attrType !== name
-          )
-          if (val.selectedTags && val.selectedTags.indexOf(tag.dict_label) == -1) {
-            val.selectedTags = [tag.dict_label]
-            paramsGetResources.infoList.push({
-              attrType: name,
-              attrValue: tag.dict_label,
-            })
-          } else {
-            val.selectedTags && val.selectedTags.splice(val.selectedTags.indexOf(tag.dict_label), 1)
-          }
+      // 点击筛选条件回调
+      const handleChange = (tag, checked, name) => {
+        loading.value = true
+        paramsGetResources.pageNum = 1
+        currentPage.value = 1
+        console.log('点击筛选条件=================>', tag, checked, name)
 
-          // 西海岸-智能算法 特殊处理
-          if (whoShow1.value.itShowXiHaiAn) {
-            if ((val.selectedTags.length == 0 && tag.dict_label == '智能算法' && !checked) || (tag.dict_label !== '智能算法' && name == '组件类型')) {
-              if (ListContentCopy.value[2]) {
-                ListContentCopy.value[2].selectedTags = []
+        // 西海岸-智能算法 特殊处理
+        if (whoShow1.value.itShowXiHaiAn) {
+          if (tag.dict_label == '智能算法' && checked) {
+            if (ListContentCopy.value[2]) {
+              ListContent.records.splice(2, 1, ListContentCopy.value[2])
+            }
+          } else {
+            if (name == '组件类型') {
+              ListContent.records.splice(2, 1)
+              paramsGetResources.infoList = paramsGetResources.infoList.filter(
+                (item) => componentTypeArray.includes(item.attrType)
+              )
+            }
+          }
+        }
+
+        ListContent.records.forEach((val) => {
+          if (!val) {
+            return
+          }
+          if (val.name === name) {
+            paramsGetResources.infoList = paramsGetResources.infoList.filter(
+              (item) => item.attrType !== name
+            )
+            if (
+              val.selectedTags &&
+              val.selectedTags.indexOf(tag.dict_label) == -1
+            ) {
+              val.selectedTags = [tag.dict_label]
+              paramsGetResources.infoList.push({
+                attrType: name,
+                attrValue: tag.dict_label,
+              })
+            } else {
+              val.selectedTags &&
+                val.selectedTags.splice(
+                  val.selectedTags.indexOf(tag.dict_label),
+                  1
+                )
+            }
+
+            // 西海岸-智能算法 特殊处理
+            if (whoShow1.value.itShowXiHaiAn) {
+              if (
+                (val.selectedTags.length == 0 &&
+                  tag.dict_label == '智能算法' &&
+                  !checked) ||
+                (tag.dict_label !== '智能算法' && name == '组件类型')
+              ) {
+                if (ListContentCopy.value[2]) {
+                  ListContentCopy.value[2].selectedTags = []
+                }
               }
             }
           }
-        }
-      })
-      listKey.value++
-      console.log('paramsGetResources---handleChange--------->', paramsGetResources);
-      getAppResources()
-    }
-    const getNewList = () => {
-      tecHnosphere = router.currentRoute.value.query.tecHnosphere
-      appLiCation = router.currentRoute.value.query.appLiCation
-      const params = {
-        topCategoryName: Cardsname.value,
+        })
+        listKey.value++
+        console.log(
+          'paramsGetResources---handleChange--------->',
+          paramsGetResources
+        )
+        getAppResources()
       }
-      selectDicStoreAll(params).then((res) => {
-        console.log('selectDicStoreAll============>', res)
-        const { data } = res.data;
-        let dataCopy = data
+      const getNewList = () => {
         tecHnosphere = router.currentRoute.value.query.tecHnosphere
         appLiCation = router.currentRoute.value.query.appLiCation
-        mybus.emit('getDeptList')
-        dataCopy.forEach((val) => {
-          val.selectedTags = []
-          if (val.name == '应用领域' && appLiCation) {
-            val.selectedTags[0] = []
-            val.selectedTags[0] = appLiCation
-            paramsGetResources.infoList.push({
-              attrType: '应用领域',
-              attrValue: appLiCation,
-            })
-            if (searchValue.value) {
-              paramsGetResources.name = searchValue.value
-            }
-
-            pageWithAttrs(paramsGetResources).then((res) => {
-              resourceList.data = []
-              resourceList.data = res.data.data.records || []
-              resourceTotal.value = res.data.data.total || ''
-            })
-          }
-          tecHnosphere = router.currentRoute.value.query.tecHnosphere
-          appLiCation = router.currentRoute.value.query.appLiCation
-          if (val.name == '技术领域' && tecHnosphere) {
-            val.selectedTags[1] = tecHnosphere
-            paramsGetResources.infoList.push({
-              attrType: '技术领域',
-              attrValue: tecHnosphere,
-            })
-            if (searchValue.value) {
-              paramsGetResources.name = searchValue.value
-            }
-            pageWithAttrs(paramsGetResources).then((res) => {
-              resourceList.data = []
-              resourceList.data = res.data.data.records || []
-              resourceTotal.value = res.data.data.total || ''
-            })
-            console.log('paramsGetResources', paramsGetResources)
-          }
-          tecHnosphere = router.currentRoute.value.query.tecHnosphere
-          appLiCation = router.currentRoute.value.query.appLiCation
-          if (val.typeList && val.typeList.length > 8) {
-            val.showShrink = true
-            val.shrinkFlag = true
-          }
-
-          if (storageSearchInfo) {
-            let obj =
-              (storageSearchInfo.infoList || []).find(
-                (x) => x.attrType === val.name
-              );
-            if (obj) {
-              val.selectedTags = [obj.attrValue] || []
-            }
-          }
-        })
-        ListContentCopy.value = []
-        ListContentCopy.value = JSON.parse(JSON.stringify(dataCopy));
-        ListContent.records = []
-        ListContent.records = JSON.parse(JSON.stringify(dataCopy));
-
-        // 智能算法-特殊处理
-        if (!storageSearchInfo) {
-          let _tag_list = dataCopy.filter(v => componentTypeArray.includes(v.name))
-          ListContent.records = _tag_list
+        const params = {
+          topCategoryName: Cardsname.value,
         }
+        selectDicStoreAll(params).then((res) => {
+          console.log('selectDicStoreAll============>', res)
+          const { data } = res.data
+          let dataCopy = data
+          tecHnosphere = router.currentRoute.value.query.tecHnosphere
+          appLiCation = router.currentRoute.value.query.appLiCation
+          mybus.emit('getDeptList')
+          dataCopy.forEach((val) => {
+            val.selectedTags = []
+            if (val.name == '应用领域' && appLiCation) {
+              val.selectedTags[0] = []
+              val.selectedTags[0] = appLiCation
+              paramsGetResources.infoList.push({
+                attrType: '应用领域',
+                attrValue: appLiCation,
+              })
+              if (searchValue.value) {
+                paramsGetResources.name = searchValue.value
+              }
 
-        listKey.value++
-        listKey2.value++
-      })
-      console.log('selectDicStoreAll', ListContent)
-    }
-    // 筛选条件
-    let ListContent = reactive({
-      records: [],
-    })
-    let ListContentCopy = ref([])
-    const resourceList = reactive({ data: [] })
-    const videoList = reactive({ data: [] })
-    const resourceTotal = ref('')
-    // 全局搜索
-    const camera = ref(null)
-    const globalData = reactive({ data: [] })
-    const globalFlag = ref(false)
-    const globalSearch = () => {
-      if (searchValue.value) {
-        globalFlag.value = true
-        getCountByFuzzyQuery(searchValue.value || '').then((res) => {
-          console.log('全局搜索==========》', res.data.data)
-          globalData.data = res.data.data
-          let mapFlag = true
-          res.data.data.map((val) => {
-            if (mapFlag && val.count != 0) {
-              mapFlag = false
-              changeCards(val.type)
+              pageWithAttrs(paramsGetResources).then((res) => {
+                resourceList.data = []
+                resourceList.data = res.data.data.records || []
+                resourceTotal.value = res.data.data.total || ''
+              })
+            }
+            tecHnosphere = router.currentRoute.value.query.tecHnosphere
+            appLiCation = router.currentRoute.value.query.appLiCation
+            if (val.name == '技术领域' && tecHnosphere) {
+              val.selectedTags[1] = tecHnosphere
+              paramsGetResources.infoList.push({
+                attrType: '技术领域',
+                attrValue: tecHnosphere,
+              })
+              if (searchValue.value) {
+                paramsGetResources.name = searchValue.value
+              }
+              pageWithAttrs(paramsGetResources).then((res) => {
+                resourceList.data = []
+                resourceList.data = res.data.data.records || []
+                resourceTotal.value = res.data.data.total || ''
+              })
+              console.log('paramsGetResources', paramsGetResources)
+            }
+            tecHnosphere = router.currentRoute.value.query.tecHnosphere
+            appLiCation = router.currentRoute.value.query.appLiCation
+            if (val.typeList && val.typeList.length > 8) {
+              val.showShrink = true
+              val.shrinkFlag = true
+            }
+
+            if (storageSearchInfo) {
+              let obj = (storageSearchInfo.infoList || []).find(
+                (x) => x.attrType === val.name
+              )
+              if (obj) {
+                val.selectedTags = [obj.attrValue] || []
+              }
             }
           })
-          if (!mapFlag) {
-            return
+          ListContentCopy.value = []
+          ListContentCopy.value = JSON.parse(JSON.stringify(dataCopy))
+          ListContent.records = []
+          ListContent.records = JSON.parse(JSON.stringify(dataCopy))
+
+          // 智能算法-特殊处理
+          if (!storageSearchInfo) {
+            let _tag_list = dataCopy.filter((v) =>
+              componentTypeArray.includes(v.name)
+            )
+            ListContent.records = _tag_list
           }
-          if (paramsGetResources.type == '基础设施') {
-            console.log('camera1', camera.value)
-            camera.value.getCamera(true, searchValue.value)
+
+          listKey.value++
+          listKey2.value++
+        })
+        console.log('selectDicStoreAll', ListContent)
+      }
+      // 筛选条件
+      let ListContent = reactive({
+        records: [],
+      })
+      let ListContentCopy = ref([])
+      const resourceList = reactive({ data: [] })
+      const videoList = reactive({ data: [] })
+      const resourceTotal = ref('')
+      // 全局搜索
+      const camera = ref(null)
+      const globalData = reactive({ data: [] })
+      const globalFlag = ref(false)
+      const globalSearch = () => {
+        if (searchValue.value) {
+          globalFlag.value = true
+          getCountByFuzzyQuery(searchValue.value || '').then((res) => {
+            console.log('全局搜索==========》', res.data.data)
+            globalData.data = res.data.data
+            let mapFlag = true
+            res.data.data.map((val) => {
+              if (mapFlag && val.count != 0) {
+                mapFlag = false
+                changeCards(val.type)
+              }
+            })
+            if (!mapFlag) {
+              return
+            }
+            if (paramsGetResources.type == '基础设施') {
+              console.log('camera1', camera.value)
+              camera.value.getCamera(true, searchValue.value)
+            } else {
+              getAppResources()
+            }
+            console.log(
+              'paramsGetResources--globalSearch---------->',
+              paramsGetResources
+            )
+          })
+        } else {
+          message.warning('全局搜索必须输入关键词！')
+        }
+      }
+      // 校验
+      const re = /^[0-9\u4E00-\u9FA5]*$/
+      const getAppResources2 = () => {
+        globalFlag.value = false
+        if (
+          whoShow1.value.itShowQingDao &&
+          paramsGetResources.type == '基础设施'
+        ) {
+          console.log('camera2', camera)
+          // camera.value.getCamera(true, searchValue.value)
+        } else {
+          if (storageSearchInfo) {
+            getAppResources('分页查询')
           } else {
             getAppResources()
           }
-          console.log('paramsGetResources--globalSearch---------->', paramsGetResources);
-
-        })
-      } else {
-        message.warning('全局搜索必须输入关键词！')
-      }
-    }
-    // 校验
-    const re = /^[0-9\u4E00-\u9FA5]*$/
-    const getAppResources2 = () => {
-      globalFlag.value = false
-      if (
-        whoShow1.value.itShowQingDao &&
-        paramsGetResources.type == '基础设施'
-      ) {
-        console.log('camera2', camera)
-        camera.value.getCamera(true, searchValue.value)
-      } else {
-        if (storageSearchInfo) {
-          getAppResources('分页查询')
-        } else {
-          getAppResources()
         }
       }
-    }
-    const getAppResources = (switchIndex) => {
-      if (!globalFlag.value) {
-        globalData.data = []
-      }
-      select = router.currentRoute.value.query.select
-      if (
-        (select == '应用资源' &&
-          (paramsGetResources.orderField == '' ||
-            paramsGetResources.orderField == 'deptSort' ||
-            paramsGetResources.orderField == 'pin_top')) ||
-        (paramsGetResources.infoList.filter(
-          (val) => val.attrType == '组件类型'
-        )[0] &&
+      const getAppResources = (switchIndex) => {
+        if (!globalFlag.value) {
+          globalData.data = []
+        }
+        select = router.currentRoute.value.query.select
+        if (
+          (select == '应用资源' &&
+            (paramsGetResources.orderField == '' ||
+              paramsGetResources.orderField == 'deptSort' ||
+              paramsGetResources.orderField == 'pin_top')) ||
+          (paramsGetResources.infoList.filter(
+            (val) => val.attrType == '组件类型'
+          )[0] &&
+            paramsGetResources.infoList.filter(
+              (val) => val.attrType == '组件类型'
+            )[0].attrValue == '图层服务' &&
+            (paramsGetResources.orderField == '' ||
+              paramsGetResources.orderField == 'deptSort' ||
+              paramsGetResources.orderField == 'pin_top'))
+        ) {
+          paramsGetResources.orderField = 'deptSort'
+        } else if (
           paramsGetResources.infoList.filter(
             (val) => val.attrType == '组件类型'
-          )[0].attrValue == '图层服务' &&
+          )[0] &&
+          paramsGetResources.infoList.filter(
+            (val) => val.attrType == '组件类型'
+          )[0].attrValue == '智能算法' &&
           (paramsGetResources.orderField == '' ||
             paramsGetResources.orderField == 'deptSort' ||
-            paramsGetResources.orderField == 'pin_top'))
-      ) {
-        paramsGetResources.orderField = 'deptSort'
-      } else if (
-        paramsGetResources.infoList.filter(
-          (val) => val.attrType == '组件类型'
-        )[0] &&
-        paramsGetResources.infoList.filter(
-          (val) => val.attrType == '组件类型'
-        )[0].attrValue == '智能算法' &&
-        (paramsGetResources.orderField == '' ||
+            paramsGetResources.orderField == 'pin_top')
+        ) {
+          paramsGetResources.orderField = 'pin_top'
+        } else if (
+          paramsGetResources.orderField == '' ||
           paramsGetResources.orderField == 'deptSort' ||
-          paramsGetResources.orderField == 'pin_top')
-      ) {
-        paramsGetResources.orderField = 'pin_top'
-      } else if (
-        paramsGetResources.orderField == '' ||
-        paramsGetResources.orderField == 'deptSort' ||
-        paramsGetResources.orderField == 'pin_top'
-      ) {
-        paramsGetResources.orderField = ''
-      }
-      if (searchValue.value) {
-        let str = ''
-        let r = null
-        if (
-          searchValue.value.length >= 2 &&
-          paramsGetResources.type !== '基础设施'
+          paramsGetResources.orderField == 'pin_top'
         ) {
-          str = searchValue.value.substring(0, 2)
-          r = re.test(str)
+          paramsGetResources.orderField = ''
         }
-        if (
-          (searchValue.value.length > 1 && r) ||
-          paramsGetResources.type === '基础设施'
-        ) {
+        if (searchValue.value) {
+          let str = ''
+          let r = null
+          if (
+            searchValue.value.length >= 2 &&
+            paramsGetResources.type !== '基础设施'
+          ) {
+            str = searchValue.value.substring(0, 2)
+            r = re.test(str)
+          }
+          if (
+            (searchValue.value.length > 1 && r) ||
+            paramsGetResources.type === '基础设施'
+          ) {
+            paramsGetResources.name = searchValue.value
+            paramsGetResources.type = Cardsname.value
+            if (
+              !whoShow1.value.itShowBaoTou &&
+              paramsGetResources.type === '数据资源'
+            ) {
+              if (switchIndex != '分页查询') {
+                paramsGetResources.pageNum = 1
+              }
+              let dataResourceParams = {
+                serviceName: paramsGetResources.name || '', //资源名称
+                orderField: whoShow1.value.itShowQingDao
+                  ? paramsGetResources.orderField == 'applyCount'
+                    ? 'syqk'
+                    : 'fbrq'
+                  : paramsGetResources.orderField == 'applyCount'
+                  ? 'requestCount'
+                  : 'createTime', //排序字段
+                orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc
+                pageNum: paramsGetResources.pageNum, //页码
+                pageSize: paramsGetResources.pageSize, //分页大小
+              }
+              getDataResource(dataResourceParams).then((res) => {
+                loading.value = false
+                console.log('res.data.data----874-------->', res.data.data)
+                if (whoShow1.value.itShowQingDao) {
+                  if (whoShow1.value.itShowZhanTingDev) {
+                    // 注意：！！！！！itShowZhanTingDev: 研发环境除数据资源用西海岸，其他配置跟青岛市局一样
+                    console.log('999----->', res.data.data.list)
+                    getXiHaiAn(res)
+                  } else {
+                    getQingDao(res)
+                  }
+                } else if (whoShow1.value.itShowXiHaiAn) {
+                  getXiHaiAn(res)
+                }
+              })
+            } else if (
+              paramsGetResources.type !== '数据资源' &&
+              (paramsGetResources.type !== '基础设施' ||
+                !whoShow1.value.itShowXiHaiAn)
+            ) {
+              if (switchIndex != '分页查询') {
+                paramsGetResources.pageNum = 1
+              }
+              pageWithAttrs(paramsGetResources).then((res) => {
+                console.log(
+                  '查询列表====22========>',
+                  resourceList,
+                  res.data.data
+                )
+                resourceList.data = []
+                videoList.data = []
+                if (Cardsname.value === '基础设施') {
+                  resourceList.data = res.data.data.records || []
+                  resourceTotal.value = res.data.data.total || ''
+                  loading.value = false
+                } else {
+                  resourceTotal.value = res.data.data.total || ''
+                  resourceList.data = res.data.data.records || []
+                }
+              })
+            } else if (
+              paramsGetResources.type === '基础设施' &&
+              whoShow1.value.itShowXiHaiAn
+            ) {
+              if (switchIndex != '分页查询') {
+                paramsGetResources.pageNum = 1
+              }
+              paramsGetResources2.value.pageNum = paramsGetResources.pageNum
+              paramsGetResources2.value.pageSize = paramsGetResources.pageSize
+              paramsGetResources2.value.name = paramsGetResources.name
+            }
+          } else {
+            message.error('请以两位以上汉字或数字开头')
+          }
+        } else {
+          //switchIndex这个参数是下面的分页传过来的参数
           paramsGetResources.name = searchValue.value
           paramsGetResources.type = Cardsname.value
           if (
@@ -896,25 +1305,24 @@ export default defineComponent({
                   ? 'syqk'
                   : 'fbrq'
                 : paramsGetResources.orderField == 'applyCount'
-                  ? 'requestCount'
-                  : 'createTime', //排序字段
+                ? 'requestCount'
+                : 'createTime', //排序字段
               orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc
               pageNum: paramsGetResources.pageNum, //页码
               pageSize: paramsGetResources.pageSize, //分页大小
             }
             getDataResource(dataResourceParams).then((res) => {
               loading.value = false
-              console.log('res.data.data----874-------->', res.data.data);
+              console.log('res.data.data----982-------->', res.data.data)
               if (whoShow1.value.itShowQingDao) {
                 if (whoShow1.value.itShowZhanTingDev) {
-                  // 注意：！！！！！itShowZhanTingDev: 研发环境除数据资源用西海岸，其他配置跟青岛市局一样
-                  console.log('999----->', res.data.data.list)
                   getXiHaiAn(res)
                 } else {
                   getQingDao(res)
                 }
               } else if (whoShow1.value.itShowXiHaiAn) {
                 getXiHaiAn(res)
+                loading.value = false
               }
             })
           } else if (
@@ -926,7 +1334,11 @@ export default defineComponent({
               paramsGetResources.pageNum = 1
             }
             pageWithAttrs(paramsGetResources).then((res) => {
-              console.log('查询列表====22========>', resourceList, res.data.data)
+              console.log(
+                '查询列表===11=========>',
+                resourceList,
+                res.data.data
+              )
               resourceList.data = []
               videoList.data = []
               if (Cardsname.value === '基础设施') {
@@ -939,7 +1351,7 @@ export default defineComponent({
               }
             })
           } else if (
-            paramsGetResources.type === '基础设施' &&
+            paramsGetResources.type === '基础设施' ||
             whoShow1.value.itShowXiHaiAn
           ) {
             if (switchIndex != '分页查询') {
@@ -947,390 +1359,345 @@ export default defineComponent({
             }
             paramsGetResources2.value.pageNum = paramsGetResources.pageNum
             paramsGetResources2.value.pageSize = paramsGetResources.pageSize
-            paramsGetResources2.value.name = paramsGetResources.name
           }
-        } else {
-          message.error('请以两位以上汉字或数字开头')
-        }
-      } else {
-        //switchIndex这个参数是下面的分页传过来的参数
-        paramsGetResources.name = searchValue.value
-        paramsGetResources.type = Cardsname.value
-        if (
-          !whoShow1.value.itShowBaoTou &&
-          paramsGetResources.type === '数据资源'
-        ) {
-          if (switchIndex != '分页查询') {
-            paramsGetResources.pageNum = 1
-          }
-          let dataResourceParams = {
-            serviceName: paramsGetResources.name || '', //资源名称
-            orderField: whoShow1.value.itShowQingDao
-              ? paramsGetResources.orderField == 'applyCount'
-                ? 'syqk'
-                : 'fbrq'
-              : paramsGetResources.orderField == 'applyCount'
-                ? 'requestCount'
-                : 'createTime', //排序字段
-            orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc
-            pageNum: paramsGetResources.pageNum, //页码
-            pageSize: paramsGetResources.pageSize, //分页大小
-          }
-          getDataResource(dataResourceParams).then((res) => {
-            loading.value = false
-            console.log('res.data.data----982-------->', res.data.data);
-            if (whoShow1.value.itShowQingDao) {
-              if (whoShow1.value.itShowZhanTingDev) {
-                getXiHaiAn(res)
-              } else {
-                getQingDao(res)
-              }
-            } else if (whoShow1.value.itShowXiHaiAn) {
-              getXiHaiAn(res)
-              loading.value = false
-            }
-          })
-        } else if (
-          paramsGetResources.type !== '数据资源' &&
-          (paramsGetResources.type !== '基础设施' ||
-            !whoShow1.value.itShowXiHaiAn)
-        ) {
-          if (switchIndex != '分页查询') {
-            paramsGetResources.pageNum = 1
-          }
-          pageWithAttrs(paramsGetResources).then((res) => {
-            console.log('查询列表===11=========>', resourceList, res.data.data)
-            resourceList.data = []
-            videoList.data = []
-            if (Cardsname.value === '基础设施') {
-              resourceList.data = res.data.data.records || []
-              resourceTotal.value = res.data.data.total || ''
-              loading.value = false
-            } else {
-              resourceTotal.value = res.data.data.total || ''
-              resourceList.data = res.data.data.records || []
-            }
-          })
-        } else if (
-          paramsGetResources.type === '基础设施' ||
-          whoShow1.value.itShowXiHaiAn
-        ) {
-          if (switchIndex != '分页查询') {
-            paramsGetResources.pageNum = 1
-          }
-          paramsGetResources2.value.pageNum = paramsGetResources.pageNum
-          paramsGetResources2.value.pageSize = paramsGetResources.pageSize
         }
       }
-    }
 
-    // 青岛-数据处理
-    const getQingDao = (res) => {
-      (res.data && res.data.data && res.data.data.data || []).forEach((val) => {
-        val.id = val.guid // id
-        val.name = val.zyname // 名字
-        val.sjlCount = val.sjcczl // 数据量
-        val.applyCount = val.syqk // 申请量
-        val.deptName = val.TGBM // 部门
-        val.createDate = val.fbrq // 发布时间
-        val.description = val.xgxt // 描述
-      })
-      resourceList.data = res.data.data.data || []
-      resourceTotal.value = res.data.data.rows || ''
-    }
-    // 青岛-西海岸处理
-    const getXiHaiAn = (res) => {
-      (res.data && res.data.data && res.data.data.list || []).forEach((val) => {
-        val.id = val.serviceId // id
-        val.name = val.serviceName // 名字
-        val.sjlCount = val.requestQuantity // 数据量
-        val.applyCount = val.requestCount // 申请量
-        val.deptName = val.departmentName // 部门
-        val.createTime = val.createTime.split('.')[0]
-        val.createDate = val.createTime // 发布时间
-      })
-      resourceList.data = res.data.data.list || []
-      resourceTotal.value = res.data.data.total || ''
-    }
-
-    let shoppingCartList = ref([])
-    // 获取申购车列表
-    const getShoppingCartList = (list) => {
-      getSgcList({
-        pageNum: 1,
-        pageSize: 500,
-        name: '',
-        type: '',
-      }).then((res) => {
-        console.log('申购车列表================>', res.data.data.records)
-        shoppingCartList.value = res.data.data.records = console.log(
-          '经过过滤后的列表信息',
-          list
+      // 青岛-数据处理
+      const getQingDao = (res) => {
+        ;((res.data && res.data.data && res.data.data.data) || []).forEach(
+          (val) => {
+            val.id = val.guid // id
+            val.name = val.zyname // 名字
+            val.sjlCount = val.sjcczl // 数据量
+            val.applyCount = val.syqk // 申请量
+            val.deptName = val.TGBM // 部门
+            val.createDate = val.fbrq // 发布时间
+            val.description = val.xgxt // 描述
+          }
         )
-        resourceList.data = list
+        resourceList.data = res.data.data.data || []
+        resourceTotal.value = res.data.data.rows || ''
+      }
+      // 青岛-西海岸处理
+      const getXiHaiAn = (res) => {
+        ;((res.data && res.data.data && res.data.data.list) || []).forEach(
+          (val) => {
+            val.id = val.serviceId // id
+            val.name = val.serviceName // 名字
+            val.sjlCount = val.requestQuantity // 数据量
+            val.applyCount = val.requestCount // 申请量
+            val.deptName = val.departmentName // 部门
+            val.createTime = val.createTime.split('.')[0]
+            val.createDate = val.createTime // 发布时间
+          }
+        )
+        resourceList.data = res.data.data.list || []
+        resourceTotal.value = res.data.data.total || ''
+      }
+
+      let shoppingCartList = ref([])
+      // 获取申购车列表
+      const getShoppingCartList = (list) => {
+        getSgcList({
+          pageNum: 1,
+          pageSize: 500,
+          name: '',
+          type: '',
+        }).then((res) => {
+          console.log('申购车列表================>', res.data.data.records)
+          shoppingCartList.value = res.data.data.records = console.log(
+            '经过过滤后的列表信息',
+            list
+          )
+          resourceList.data = list
+        })
+      }
+      mybus.on('getCameraByParentId', (ids) => {
+        paramsGetResources2.value.regionId = ids
+        getAppResources()
       })
-    }
-    mybus.on('getCameraByParentId', (ids) => {
-      paramsGetResources2.value.regionId = ids
-      getAppResources()
-    })
-    mybus.on('paramsGetResources', (ids) => {
-      if (ids && ids.length > 0) {
-        paramsGetResources.deptIds = ids
-      } else {
-        delete paramsGetResources.deptIds
-      }
-      getAppResources()
-      console.log('paramsGetResources-----paramsGetResources------->', paramsGetResources);
-    })
-    mybus.on('changePage', (page) => {
-      paramsGetResources.pageNum = page
-      getAppResources('分页查询')
-      console.log('paramsGetResources----changePage-------->', paramsGetResources);
-    })
-    mybus.on('changeSelcted', () => {
-      // 添加申购车后，返回第一页
-      paramsGetResources.pageNum = 1
-      currentPage.value = 1
-      getAppResources()
-      console.log('paramsGetResources----changeSelcted-------->', paramsGetResources);
-    })
-    mybus.on('changeInfo', (info) => {
-      paramsGetResources.pageNum = 1
-      console.log('paramsGetResources.infoList', paramsGetResources.infoList)
-      paramsGetResources.infoList = paramsGetResources.infoList.filter(
-        (item) => item.attrType !== '文件类型'
-      )
-      if (info) {
-        paramsGetResources.infoList.push(info)
-      }
-      getAppResources()
-      console.log('paramsGetResources-----changeInfo------->', paramsGetResources);
-
-    })
-    mybus.on('refresh', () => {
-      paramsGetResources.pageNum = 1
-      currentPage.value = 1
-      getAppResources()
-      console.log('paramsGetResources-----refresh------->', paramsGetResources);
-    })
-
-    mybus.on('changeCondition', (condition) => {
-      if (!storageSearchInfo) {
-        // 回到第一页，分页页码为1
+      mybus.on('paramsGetResources', (ids) => {
+        if (ids && ids.length > 0) {
+          paramsGetResources.deptIds = ids
+        } else {
+          delete paramsGetResources.deptIds
+        }
+        getAppResources()
+        console.log(
+          'paramsGetResources-----paramsGetResources------->',
+          paramsGetResources
+        )
+      })
+      mybus.on('changePage', (page) => {
+        paramsGetResources.pageNum = page
+        getAppResources('分页查询')
+        console.log(
+          'paramsGetResources----changePage-------->',
+          paramsGetResources
+        )
+      })
+      mybus.on('changeSelcted', () => {
+        // 添加申购车后，返回第一页
         paramsGetResources.pageNum = 1
         currentPage.value = 1
-      }
-      // orderField: 'total' total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
-      // orderType: 'ASC'  ASC 升序  DESC 降序
-      paramsGetResources.orderField = condition.orderField
-      paramsGetResources.orderType = condition.orderType
-      if (storageSearchInfo) {
-        getAppResources('分页查询')
-      } else {
         getAppResources()
-      }
-      console.log('paramsGetResources---changeCondition--------->', paramsGetResources);
-    })
+        console.log(
+          'paramsGetResources----changeSelcted-------->',
+          paramsGetResources
+        )
+      })
+      mybus.on('changeInfo', (info) => {
+        paramsGetResources.pageNum = 1
+        console.log('paramsGetResources.infoList', paramsGetResources.infoList)
+        paramsGetResources.infoList = paramsGetResources.infoList.filter(
+          (item) => item.attrType !== '文件类型'
+        )
+        if (info) {
+          paramsGetResources.infoList.push(info)
+        }
+        getAppResources()
+        console.log(
+          'paramsGetResources-----changeInfo------->',
+          paramsGetResources
+        )
+      })
+      mybus.on('refresh', () => {
+        paramsGetResources.pageNum = 1
+        currentPage.value = 1
+        getAppResources()
+        console.log(
+          'paramsGetResources-----refresh------->',
+          paramsGetResources
+        )
+      })
 
-    const pageChange = (val) => {
-      console.log('pageChange------------>', val);
-      loading.value = true
-      currentPage.value = val
-      paramsGetResources.pageNum = val
-      getAppResources('分页查询') //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
-      console.log('paramsGetResources-----pageChange------->', paramsGetResources);
-    }
-
-    onMounted(() => {
-      // 从本地读取查询条件，赋值
-      handleSetSearchData()
-
-      listKey2.value++
-      // 获取筛选条件
-      getNewList()
-      if (!tecHnosphere && !appLiCation) {
-        if (searchValue.value && !select2) {
-          globalSearch()
+      mybus.on('changeCondition', (condition) => {
+        if (!storageSearchInfo) {
+          // 回到第一页，分页页码为1
+          paramsGetResources.pageNum = 1
+          currentPage.value = 1
+        }
+        // orderField: 'total' total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
+        // orderType: 'ASC'  ASC 升序  DESC 降序
+        paramsGetResources.orderField = condition.orderField
+        paramsGetResources.orderType = condition.orderType
+        if (storageSearchInfo) {
+          getAppResources('分页查询')
         } else {
-          getAppResources2()
+          getAppResources()
+        }
+        console.log(
+          'paramsGetResources---changeCondition--------->',
+          paramsGetResources
+        )
+      })
+
+      const pageChange = (val) => {
+        console.log('pageChange------------>', val)
+        loading.value = true
+        currentPage.value = val
+        paramsGetResources.pageNum = val
+        getAppResources('分页查询') //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
+        console.log(
+          'paramsGetResources-----pageChange------->',
+          paramsGetResources
+        )
+      }
+
+      onMounted(() => {
+        // 从本地读取查询条件，赋值
+        handleSetSearchData()
+
+        listKey2.value++
+        // 获取筛选条件
+        getNewList()
+        if (!tecHnosphere && !appLiCation) {
+          if (searchValue.value && !select2) {
+            globalSearch()
+          } else {
+            getAppResources2()
+          }
+        }
+      })
+      // 全部申请
+      const applyAll = () => {
+        router.push({
+          path: '/apply',
+          query: {
+            applyAll: true,
+          },
+        })
+      }
+      // 分页
+      const onShowSizeChange = (current, pageSize) => {
+        currentPage.value = current
+        currentPageSize.value = pageSize
+        paramsGetResources.pageNum = current
+        paramsGetResources.pageSize = pageSize
+        getAppResources()
+        console.log(
+          'paramsGetResources----onShowSizeChange-------->',
+          paramsGetResources
+        )
+      }
+      watch(currentPageSize, () => {
+        console.log('pageSize', currentPageSize.value)
+      })
+
+      const changeShrink = (name) => {
+        ListContent.records.forEach((val) => {
+          if (val.name === name) {
+            console.log(val)
+            val.shrinkFlag = !val.shrinkFlag
+          }
+        })
+      }
+      const changeCards = (name) => {
+        resourceList.data = []
+        videoList.data = []
+        resourceTotal.value = ''
+        router.currentRoute.value.query.tecHnosphere = ''
+        router.currentRoute.value.query.appLiCation = ''
+        tecHnosphere = router.currentRoute.value.query.tecHnosphere
+        appLiCation = router.currentRoute.value.query.appLiCation
+        let newQuery = JSON.parse(
+          JSON.stringify(router.currentRoute.value.query)
+        )
+        Cardsname.value = name
+        newQuery.select = Cardsname.value
+        router
+          .replace({
+            query: newQuery,
+          })
+          .then(() => {
+            tagFlag.value = false
+            chongzhi(true)
+            getNewList()
+          })
+      }
+      // 监听地址栏变化
+      window.addEventListener('hashchange', () => {
+        location.reload()
+        console.log('URL发生变化了')
+      })
+      // 能力广场
+      const visibleAbilitySquare = ref(false)
+      let abilitySquare = ref(['应用广场', '算法广场', 'GIS广场'])
+      const showAbilitySquareNum = ref(0)
+      const showAbilitySquare = () => {
+        if (showAbilitySquareNum.value === 0) {
+          showAbilitySquareNum.value = 1
+          visibleAbilitySquare.value = true
+        } else if (showAbilitySquareNum.value === 1) {
+          showAbilitySquareNum.value = 0
+          visibleAbilitySquare.value = false
         }
       }
-    })
-    // 全部申请
-    const applyAll = () => {
-      router.push({
-        path: '/apply',
-        query: {
-          applyAll: true,
-        },
-      })
-    }
-    // 分页
-    const onShowSizeChange = (current, pageSize) => {
-      currentPage.value = current
-      currentPageSize.value = pageSize
-      paramsGetResources.pageNum = current
-      paramsGetResources.pageSize = pageSize
-      getAppResources()
-      console.log('paramsGetResources----onShowSizeChange-------->', paramsGetResources);
-
-    }
-    watch(currentPageSize, () => {
-      console.log('pageSize', currentPageSize.value)
-    })
-
-    const changeShrink = (name) => {
-      ListContent.records.forEach((val) => {
-        if (val.name === name) {
-          console.log(val)
-          val.shrinkFlag = !val.shrinkFlag
+      let abilitySquareFunctionData = ref('智能算法')
+      const abilitySquareFunction = (e) => {
+        let snumSquare = ref({})
+        if (e === '应用广场') {
+          abilitySquareFunctionData.value = '应用资源'
+        } else if (e === '算法广场') {
+          abilitySquareFunctionData.value = '智能算法'
+        } else if (e === 'GIS广场') {
+          abilitySquareFunctionData.value = '图层服务'
         }
-      })
-    }
-    const changeCards = (name) => {
-      resourceList.data = []
-      videoList.data = []
-      resourceTotal.value = ''
-      router.currentRoute.value.query.tecHnosphere = ''
-      router.currentRoute.value.query.appLiCation = ''
-      tecHnosphere = router.currentRoute.value.query.tecHnosphere
-      appLiCation = router.currentRoute.value.query.appLiCation
-      let newQuery = JSON.parse(JSON.stringify(router.currentRoute.value.query))
-      Cardsname.value = name
-      newQuery.select = Cardsname.value
-      router
-        .replace({
-          query: newQuery,
+        snumSquare.value = {
+          abilityToType: abilitySquareFunctionData.value,
+        }
+        const applypage = router.resolve({
+          path: '/capacitySquare', // 跳转的页面路由
+          query: snumSquare.value,
         })
-        .then(() => {
-          tagFlag.value = false
-          chongzhi(true)
-          getNewList()
-        })
-    }
-    // 监听地址栏变化
-    window.addEventListener('hashchange', () => {
-      location.reload()
-      console.log('URL发生变化了')
-    })
-    // 能力广场
-    const visibleAbilitySquare = ref(false)
-    let abilitySquare = ref(['应用广场', '算法广场', 'GIS广场'])
-    const showAbilitySquareNum = ref(0)
-    const showAbilitySquare = () => {
-      if (showAbilitySquareNum.value === 0) {
-        showAbilitySquareNum.value = 1
-        visibleAbilitySquare.value = true
-      } else if (showAbilitySquareNum.value === 1) {
-        showAbilitySquareNum.value = 0
+        window.open(applypage.href, '_blank')
         visibleAbilitySquare.value = false
-      }
-    }
-    let abilitySquareFunctionData = ref('智能算法')
-    const abilitySquareFunction = (e) => {
-      let snumSquare = ref({})
-      if (e === '应用广场') {
-        abilitySquareFunctionData.value = '应用资源'
-      } else if (e === '算法广场') {
         abilitySquareFunctionData.value = '智能算法'
-      } else if (e === 'GIS广场') {
-        abilitySquareFunctionData.value = '图层服务'
       }
-      snumSquare.value = {
-        abilityToType: abilitySquareFunctionData.value,
+
+      // 存储查询条件到本地 todo
+      const saveSearchCodition = () => {
+        console.log('存储查询条件到本地---DetailsPageconetent----->', 1111)
+        localStorage.setItem(
+          'DetailsPageconetent',
+          JSON.stringify(paramsGetResources)
+        )
       }
-      const applypage = router.resolve({
-        path: '/capacitySquare', // 跳转的页面路由
-        query: snumSquare.value,
-      })
-      window.open(applypage.href, '_blank')
-      visibleAbilitySquare.value = false
-      abilitySquareFunctionData.value = '智能算法'
-    }
 
-    // 存储查询条件到本地 todo
-    const saveSearchCodition = () => {
-      console.log('存储查询条件到本地---DetailsPageconetent----->', 1111)
-      localStorage.setItem(
-        'DetailsPageconetent',
-        JSON.stringify(paramsGetResources)
-      )
-    }
-
-    return {
-      listKey,
-      ListContent,
-      searchValue,
-      currentPage,
-      ...toRefs(state),
-      changeCards,
-      handleChange,
-      resourceList,
-      videoList,
-      resourceTotal,
-      pageChange,
-      listKey2,
-      Cardsname,
-      getNewList,
-      getAppResources,
-      getAppResources2,
-      chongzhi,
-      onSearch,
-      onShowSizeChange,
-      currentPageSize,
-      pageSizeOptions,
-      changeShrink,
-      titleName,
-      keyongziyuanqingkaung,
-      shujuziyuanqingkuang,
-      dianjitiaozhaun,
-      chagneTag,
-      tagFlag,
-      current,
-      openMonitor,
-      loading,
-      getShoppingCartList,
-      whoShow1,
-      applyAll,
-      handleAdd,
-      flag,
-      abilitySquare,
-      visibleAbilitySquare,
-      showAbilitySquare,
-      abilitySquareFunction,
-      abilitySquareFunctionData,
-      showAbilitySquareNum,
-      globalData,
-      globalSearch,
-      camera,
-      saveSearchCodition,
-      searchResultListDom,
-      handleSetSearchData, // todo
-    }
-  },
-  components: {
-    HomeHeader,
-    HomeFooter,
-    detailsPageconetentTree,
-    searchResultList,
-    UpOutlined,
-    DownOutlined,
-    KnowledgeBase,
-    DetailsPageResource,
-    infrastructurePage,
-    detailsPageInfrastructureTree,
-  },
-  beforeUnmount() {
-    mybus.off('getCameraByParentId')
-    mybus.off('selectCardsitem')
-    mybus.off('paramsGetResources')
-    mybus.off('changeCondition')
-    mybus.off('refresh')
-    mybus.off('changePage')
-    mybus.off('changeInfo')
-  },
-})
+      return {
+        listKey,
+        ListContent,
+        searchValue,
+        currentPage,
+        ...toRefs(state),
+        changeCards,
+        handleChange,
+        resourceList,
+        videoList,
+        resourceTotal,
+        pageChange,
+        listKey2,
+        Cardsname,
+        getNewList,
+        getAppResources,
+        getAppResources2,
+        chongzhi,
+        onSearch,
+        onShowSizeChange,
+        currentPageSize,
+        pageSizeOptions,
+        changeShrink,
+        titleName,
+        keyongziyuanqingkaung,
+        shujuziyuanqingkuang,
+        dianjitiaozhaun,
+        chagneTag,
+        tagFlag,
+        current,
+        openMonitor,
+        loading,
+        getShoppingCartList,
+        whoShow1,
+        applyAll,
+        handleAdd,
+        flag,
+        abilitySquare,
+        visibleAbilitySquare,
+        showAbilitySquare,
+        abilitySquareFunction,
+        abilitySquareFunctionData,
+        showAbilitySquareNum,
+        globalData,
+        globalSearch,
+        camera,
+        saveSearchCodition,
+        searchResultListDom,
+        handleSetSearchData, // todo
+      }
+    },
+    components: {
+      HomeHeader,
+      HomeFooter,
+      detailsPageconetentTree,
+      searchResultList,
+      UpOutlined,
+      DownOutlined,
+      KnowledgeBase,
+      DetailsPageResource,
+      infrastructurePage,
+      detailsPageInfrastructureTree,
+    },
+    beforeUnmount() {
+      mybus.off('getCameraByParentId')
+      mybus.off('selectCardsitem')
+      mybus.off('paramsGetResources')
+      mybus.off('changeCondition')
+      mybus.off('refresh')
+      mybus.off('changePage')
+      mybus.off('changeInfo')
+    },
+  })
 </script>
 <style lang="less" scoped>
 @font-face {
@@ -1452,7 +1819,8 @@ export default defineComponent({
           display: flex;
           align-items: center;
 
-          .tupian {}
+          .tupian {
+          }
 
           .title {
             margin-left: 0.1rem;
@@ -1485,7 +1853,7 @@ export default defineComponent({
         }
       }
 
-      .yunziyuan>div {
+      .yunziyuan > div {
         margin-bottom: 0.1rem;
       }
 
@@ -1496,7 +1864,8 @@ export default defineComponent({
           display: flex;
           align-items: center;
 
-          .tupian {}
+          .tupian {
+          }
 
           .title {
             margin-left: 0.1rem;
@@ -1520,12 +1889,12 @@ export default defineComponent({
         }
       }
 
-      .shipin>div {
+      .shipin > div {
         margin-bottom: 0.1rem;
       }
     }
 
-    .jichusheshi>div {
+    .jichusheshi > div {
       padding-top: 0.1rem;
       border-radius: 0.04rem;
       margin-bottom: 0.2rem;
@@ -1554,7 +1923,8 @@ export default defineComponent({
           align-items: center;
           margin-left: 0.2rem;
 
-          .tupian {}
+          .tupian {
+          }
 
           .title {
             margin-left: 0.1rem;
@@ -1587,12 +1957,12 @@ export default defineComponent({
         }
       }
 
-      .yunziyuan>div {
+      .yunziyuan > div {
         margin-bottom: 0.1rem;
       }
     }
 
-    .shujuziyuan>div {
+    .shujuziyuan > div {
       background: #eaf4ff;
       padding-top: 0.1rem;
       border-radius: 0.04rem;
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 50ec24e5..878bf69b 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -456,16 +456,31 @@
             批量预览
           </a-button>
           <!-- 添加至申购车 -->
-          <a-button type="primary" @click="addShoppingCart" class="buttonAdd" v-if="!cloudResourcesFlag">
+          <a-button
+            type="primary"
+            @click="addShoppingCart"
+            class="buttonAdd"
+            v-if="!cloudResourcesFlag"
+          >
             添加至申购车
           </a-button>
           <!-- 一键申请 -->
-          <a-button type="primary" @click="apply" class="buttonAdd" v-if="!cloudResourcesFlag">
+          <a-button
+            type="primary"
+            @click="apply"
+            class="buttonAdd"
+            v-if="!cloudResourcesFlag"
+          >
             一键申请
           </a-button>
-           <!-- 申请政务云资源 -->
-          <a-button type="primary" @click="applyCloudResources" class="buttonAdd"  v-if="cloudResourcesFlag">
-           我要申请政务云资源
+          <!-- 申请政务云资源 -->
+          <a-button
+            type="primary"
+            @click="applyCloudResources"
+            class="buttonAdd"
+            v-if="cloudResourcesFlag"
+          >
+            我要申请政务云资源
           </a-button>
         </div>
       </div>
@@ -899,7 +914,7 @@
       }
     } else {
       tabClick(0, '政务云资源')
-      getCamera()
+      // getCamera()
     }
 
     mybus.off('getListByParentId')
@@ -920,7 +935,7 @@
   const tabList = ref([
     {
       title: '设施类型',
-      content: ['政务云资源','视频资源', '感知资源', '城市云脑会客厅'],
+      content: ['政务云资源', '视频资源', '感知资源', '城市云脑会客厅'],
     },
     {
       title: '视频标签',
@@ -1340,13 +1355,13 @@
     selectedList.value = []
     if (clickList.value[indexFather].content.indexOf(name) != -1) {
       if (name == '视频资源') {
-        cloudResourcesFlag.value = false;
+        cloudResourcesFlag.value = false
         room.value = true
         tableHeight.value = 330
         showMap.value = true
         tabList.value[1].title = '视频标签'
       } else if (name == '政务云资源') {
-        cloudResourcesFlag.value = true;
+        cloudResourcesFlag.value = true
         room.value = true
         tableHeight.value = 600
         showMap.value = false
@@ -1355,7 +1370,7 @@
         pagination.value.total = 0
         tabList.value[1].title = '政务云资源分类'
       } else if (name == '感知资源') {
-        cloudResourcesFlag.value = false;
+        cloudResourcesFlag.value = false
         room.value = true
         tableHeight.value = 330
         showMap.value = true
@@ -1363,7 +1378,7 @@
         dataSource2.value = []
         pagination.value.total = 0
       } else if (name == '城市云脑会客厅') {
-          cloudResourcesFlag.value = false;
+        cloudResourcesFlag.value = false
         //     room.value = false
         //     wrjFlag.value = true
         //     showMap.value = false
@@ -1380,7 +1395,7 @@
     } else {
       if (name == '视频资源') {
         wrjFlag.value = false
-        cloudResourcesFlag.value = false;
+        cloudResourcesFlag.value = false
         tableHeight.value = 330
         showMap.value = true
         tabList.value[1].content = []
@@ -1408,7 +1423,7 @@
         emits('add', 1)
         getCamera()
       } else if (name == '政务云资源') {
-        cloudResourcesFlag.value = true;
+        cloudResourcesFlag.value = true
         tableHeight.value = 600
         showMap.value = false
         dataSource.value = []
@@ -1431,7 +1446,7 @@
         wrjFlag.value = false
         emits('add', 2)
       } else if (name == '感知资源') {
-        cloudResourcesFlag.value = false;
+        cloudResourcesFlag.value = false
         tableHeight.value = 330
         showMap.value = true
         clickList.value[1].content = []
@@ -1445,7 +1460,7 @@
         wrjFlag.value = false
         emits('add', 3)
       } else if (name == '无人机') {
-        cloudResourcesFlag.value = false;
+        cloudResourcesFlag.value = false
         room.value = true
         tableHeight.value = 600
         showMap.value = false
@@ -1466,7 +1481,7 @@
         })
         wrjFlag.value = true
       } else if (name == '单兵设备') {
-        cloudResourcesFlag.value = false;
+        cloudResourcesFlag.value = false
         room.value = true
         tableHeight.value = 600
         showMap.value = false
@@ -1487,7 +1502,7 @@
         })
         wrjFlag.value = true
       } else if (name == '城市云脑会客厅') {
-        cloudResourcesFlag.value = false;
+        cloudResourcesFlag.value = false
         showMap.value = false
         dataSource.value = []
         dataSource2.value = []
@@ -1769,8 +1784,8 @@
     }
   }
   // 申请政务云资源
-   const applyCloudResources = () => {
-    window.open("http://15.72.183.88:8760/yzy/login")
+  const applyCloudResources = () => {
+    window.open('http://15.72.183.88:8760/yzy/login')
   }
   // 表格
   const dataSource = ref([])
@@ -1877,209 +1892,97 @@
   }
 </script>
 <style lang="less" scoped>
-  .infrastructrueBox {
-    padding: 0.2rem;
-    // background: #f3f5f9;
-    background: #ffffff;
-    /* padding: 0.16rem; */
-    border-bottom: 0.01rem solid rgba(150, 144, 144, 0.3);
-    .infrastructrue-tab {
-      // background: #ffffff;
-      // padding: 0.2rem;
-      // border-bottom: 0.01rem solid rgba(150, 144, 144, 0.3);
-      span {
-        display: inline-block;
-        height: 0.24rem;
-        font-size: 0.14rem;
-        line-height: 0.24rem;
-        border: 0;
-        border-radius: 0.12rem;
-        margin-left: 0.1rem;
-        text-align: center;
-        color: #666666;
-        cursor: pointer;
-        padding: 0 0.08rem;
-      }
-      .leftType {
-        margin: 0.2rem 0;
-        margin-right: 0.06rem;
-      }
-      .down {
-        background: #0087ff;
-        color: #ffffff;
-      }
-      .tabBox {
-        margin-bottom: 0.16rem;
-      }
-      .tabBox:last-of-type {
-        margin-bottom: 0;
-      }
+.infrastructrueBox {
+  padding: 0.2rem;
+  // background: #f3f5f9;
+  background: #ffffff;
+  /* padding: 0.16rem; */
+  border-bottom: 0.01rem solid rgba(150, 144, 144, 0.3);
+  .infrastructrue-tab {
+    // background: #ffffff;
+    // padding: 0.2rem;
+    // border-bottom: 0.01rem solid rgba(150, 144, 144, 0.3);
+    span {
+      display: inline-block;
+      height: 0.24rem;
+      font-size: 0.14rem;
+      line-height: 0.24rem;
+      border: 0;
+      border-radius: 0.12rem;
+      margin-left: 0.1rem;
+      text-align: center;
+      color: #666666;
+      cursor: pointer;
+      padding: 0 0.08rem;
     }
-    .infrastructrue-content {
-      display: flex;
-      justify-content: space-between;
-      padding: 0.14rem 0.2rem 0.1rem;
-      background: #ffffff;
-      .contentNum {
-        position: relative;
-        display: flex;
-        p {
-          color: #666666;
-          padding: 0;
-          margin: 0;
-          span {
-            color: #0087ff;
-            font-size: 0.2rem;
-            font-weight: 500;
-          }
-        }
-        p:first-of-type {
-          padding-right: 0.16rem;
-          margin-right: 0.16rem;
-        }
-        .boundary {
-          position: absolute;
-          left: 0.9rem;
-          top: 0.07rem;
-          display: block;
-          width: 0.02rem;
-          border-radius: 0.01rem;
-          height: 0.2rem;
-          background: rgba(150, 144, 144, 0.3);
-        }
-      }
-      .contentRight {
-        position: relative;
-        display: flex;
-        justify-content: space-between;
-        .boundary {
-          position: absolute;
-          left: 3.74rem;
-          top: 0.07rem;
-          display: block;
-          width: 0.02rem;
-          border-radius: 0.01rem;
-          height: 0.2rem;
-          background: rgba(150, 144, 144, 0.3);
-        }
-        .searchInput {
-          display: flex;
-          margin-right: 0.2rem;
-          .ant-input-search {
-            max-width: 4rem;
-          }
-          :deep(.ant-input) {
-            width: 2rem;
-            height: 0.36rem;
-            font-size: 0.14rem;
-            color: #b2b2b2;
-            background: #f5f5f5;
-          }
-          :deep(.ant-input-group-addon) {
-            display: inline-block;
-            margin-left: 0.1rem;
-            .ant-input-search-button {
-              width: 0.8rem;
-              height: 0.36rem;
-              background: #0558e1;
-              border-radius: 0.04rem;
-              font-size: 0.14rem;
-            }
-          }
-          :deep(.ant-btn) {
-            background: #0558e1;
-            border-radius: 0.04rem;
-          }
-        }
-        .buttonAdd {
-          background: #0558e1;
-          border-radius: 0.04rem;
-          height: 0.36rem;
-          border-color: #0558e1;
-          margin-left: 0.1rem;
-        }
-      }
+    .leftType {
+      margin: 0.2rem 0;
+      margin-right: 0.06rem;
     }
-    .infrastructrue-table {
-      .ant-table-striped :deep(.table-striped) td {
-        background-color: #fafafa;
-      }
+    .down {
+      background: #0087ff;
+      color: #ffffff;
     }
-    .map-contain {
-      // width: 9.46rem;
-      height: 4.1rem;
-      margin-left: 0.16rem;
-      position: relative;
+    .tabBox {
+      margin-bottom: 0.16rem;
     }
-  }
-  .roomBackground {
-    background: #0058e1;
-    color: #ffffff;
-  }
-  .nullBackground {
-    background: #f3f5f9;
-    color: #0087ff;
-  }
-  :deep(.ant-form-item-control-input-content) {
-    margin-left: 0.15rem;
-  }
-  :deep(.ant-col) {
-    .ant-form-item {
+    .tabBox:last-of-type {
       margin-bottom: 0;
     }
   }
-  .jinggaoD {
+  .infrastructrue-content {
     display: flex;
-    align-items: center;
-  }
-  .jinggaoNull {
-    display: none;
-  }
-  .imgJinggao {
-    width: 0.2rem;
-    height: 0.2rem;
-    background: url('~@/assets/home/jingao.png') no-repeat;
-    background-size: 100%;
-  }
-  .introduction {
-    :deep(.ant-form-item-control) {
-      margin-left: -2.1rem;
-    }
-  }
-  .roomBox {
-    .leftMake {
-      float: left;
-      margin-left: -1rem;
-      margin-top: -0.5rem;
-      font-size: 0.2rem;
-      cursor: pointer;
-      .leftTop {
-        width: 0.6rem;
-        height: 1.75rem;
-        border-top-left-radius: 0.08rem;
-        border-bottom-left-radius: 0.08rem;
-        padding: 0.13rem;
-        text-align: center;
-      }
-      .leftBottom {
-        width: 0.6rem;
-        height: 1.75rem;
-        border-top-left-radius: 0.08rem;
-        border-bottom-left-radius: 0.08rem;
-        padding: 0.2rem 0.13rem 0.1rem 0.1rem;
-        text-align: center;
-      }
-    }
-    .roomSearch {
+    justify-content: space-between;
+    padding: 0.14rem 0.2rem 0.1rem;
+    background: #ffffff;
+    .contentNum {
+      position: relative;
       display: flex;
-      align-items: center;
+      p {
+        color: #666666;
+        padding: 0;
+        margin: 0;
+        span {
+          color: #0087ff;
+          font-size: 0.2rem;
+          font-weight: 500;
+        }
+      }
+      p:first-of-type {
+        padding-right: 0.16rem;
+        margin-right: 0.16rem;
+      }
+      .boundary {
+        position: absolute;
+        left: 0.9rem;
+        top: 0.07rem;
+        display: block;
+        width: 0.02rem;
+        border-radius: 0.01rem;
+        height: 0.2rem;
+        background: rgba(150, 144, 144, 0.3);
+      }
+    }
+    .contentRight {
+      position: relative;
+      display: flex;
+      justify-content: space-between;
+      .boundary {
+        position: absolute;
+        left: 3.74rem;
+        top: 0.07rem;
+        display: block;
+        width: 0.02rem;
+        border-radius: 0.01rem;
+        height: 0.2rem;
+        background: rgba(150, 144, 144, 0.3);
+      }
       .searchInput {
         display: flex;
         margin-right: 0.2rem;
-        margin-left: 0.2rem;
-        // .ant-input-search {
-        //   max-width: 4rem;
-        // }
+        .ant-input-search {
+          max-width: 4rem;
+        }
         :deep(.ant-input) {
           width: 2rem;
           height: 0.36rem;
@@ -2094,143 +1997,255 @@
             width: 0.8rem;
             height: 0.36rem;
             background: #0558e1;
-            border-radius: 0.06rem;
+            border-radius: 0.04rem;
             font-size: 0.14rem;
           }
         }
         :deep(.ant-btn) {
-          border-radius: 0.06rem;
+          background: #0558e1;
+          border-radius: 0.04rem;
         }
       }
-    }
-    .roomTableList {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      margin: 0.4rem 0 0.2rem 0;
-      .roomTime {
-        display: flex;
-        align-items: center;
-        :deep(.ant-space-vertical) {
-          flex-direction: inherit;
-          margin-left: 0.2rem;
-        }
+      .buttonAdd {
+        background: #0558e1;
+        border-radius: 0.04rem;
+        height: 0.36rem;
+        border-color: #0558e1;
+        margin-left: 0.1rem;
       }
     }
-    .roomItem {
-      width: 10.3rem;
-      height: 2rem;
-      border-top: 1px #d5d4d4 solid;
-      display: flex;
-      align-items: center;
-      .leftImg {
-        width: 2.4rem;
-        height: 1.75rem;
-        margin: 0 0.3rem 0 0.15rem;
-
-        // background: url('~@/assets/home/yyzy_square.png') no-repeat;
-        background-size: 100%;
-        img {
-          width: 100%;
-          height: 100%;
-        }
-      }
-      .rightContent {
-        height: 1.75rem;
-        width: 5.8rem;
-        .topContent {
-          font-size: 0.2rem;
-          color: #000;
-          font-weight: 600;
-        }
-        .centerContent {
-          display: flex;
-          justify-content: space-between;
-          font-size: 0.14rem;
-          margin: 0.15rem 0 0.2rem 0;
-        }
-      }
-    }
-    :deep(.ant-pagination) {
-      float: right;
-    }
-    :deep(.ant-pagination) {
-      text-align: end;
-    }
   }
+  .infrastructrue-table {
+    .ant-table-striped :deep(.table-striped) td {
+      background-color: #fafafa;
+    }
+  }
+  .map-contain {
+    // width: 9.46rem;
+    height: 4.1rem;
+    margin-left: 0.16rem;
+    position: relative;
+  }
+}
+.roomBackground {
+  background: #0058e1;
+  color: #ffffff;
+}
+.nullBackground {
+  background: #f3f5f9;
+  color: #0087ff;
+}
+:deep(.ant-form-item-control-input-content) {
+  margin-left: 0.15rem;
+}
+:deep(.ant-col) {
+  .ant-form-item {
+    margin-bottom: 0;
+  }
+}
+.jinggaoD {
+  display: flex;
+  align-items: center;
+}
+.jinggaoNull {
+  display: none;
+}
+.imgJinggao {
+  width: 0.2rem;
+  height: 0.2rem;
+  background: url('~@/assets/home/jingao.png') no-repeat;
+  background-size: 100%;
+}
+.introduction {
+  :deep(.ant-form-item-control) {
+    margin-left: -2.1rem;
+  }
+}
+.roomBox {
+  .leftMake {
+    float: left;
+    margin-left: -1rem;
+    margin-top: -0.5rem;
+    font-size: 0.2rem;
+    cursor: pointer;
+    .leftTop {
+      width: 0.6rem;
+      height: 1.75rem;
+      border-top-left-radius: 0.08rem;
+      border-bottom-left-radius: 0.08rem;
+      padding: 0.13rem;
+      text-align: center;
+    }
+    .leftBottom {
+      width: 0.6rem;
+      height: 1.75rem;
+      border-top-left-radius: 0.08rem;
+      border-bottom-left-radius: 0.08rem;
+      padding: 0.2rem 0.13rem 0.1rem 0.1rem;
+      text-align: center;
+    }
+  }
+  .roomSearch {
+    display: flex;
+    align-items: center;
+    .searchInput {
+      display: flex;
+      margin-right: 0.2rem;
+      margin-left: 0.2rem;
+      // .ant-input-search {
+      //   max-width: 4rem;
+      // }
+      :deep(.ant-input) {
+        width: 2rem;
+        height: 0.36rem;
+        font-size: 0.14rem;
+        color: #b2b2b2;
+        background: #f5f5f5;
+      }
+      :deep(.ant-input-group-addon) {
+        display: inline-block;
+        margin-left: 0.1rem;
+        .ant-input-search-button {
+          width: 0.8rem;
+          height: 0.36rem;
+          background: #0558e1;
+          border-radius: 0.06rem;
+          font-size: 0.14rem;
+        }
+      }
+      :deep(.ant-btn) {
+        border-radius: 0.06rem;
+      }
+    }
+  }
+  .roomTableList {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin: 0.4rem 0 0.2rem 0;
+    .roomTime {
+      display: flex;
+      align-items: center;
+      :deep(.ant-space-vertical) {
+        flex-direction: inherit;
+        margin-left: 0.2rem;
+      }
+    }
+  }
+  .roomItem {
+    width: 10.3rem;
+    height: 2rem;
+    border-top: 1px #d5d4d4 solid;
+    display: flex;
+    align-items: center;
+    .leftImg {
+      width: 2.4rem;
+      height: 1.75rem;
+      margin: 0 0.3rem 0 0.15rem;
+
+      // background: url('~@/assets/home/yyzy_square.png') no-repeat;
+      background-size: 100%;
+      img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+    .rightContent {
+      height: 1.75rem;
+      width: 5.8rem;
+      .topContent {
+        font-size: 0.2rem;
+        color: #000;
+        font-weight: 600;
+      }
+      .centerContent {
+        display: flex;
+        justify-content: space-between;
+        font-size: 0.14rem;
+        margin: 0.15rem 0 0.2rem 0;
+      }
+    }
+  }
+  :deep(.ant-pagination) {
+    float: right;
+  }
+  :deep(.ant-pagination) {
+    text-align: end;
+  }
+}
 </style>
 <style lang="less">
-  .wrj {
-    .ant-modal-body {
-      height: 700px !important;
-    }
+.wrj {
+  .ant-modal-body {
+    height: 700px !important;
   }
-  .modalClass {
-    .ant-modal-body {
-      height: 4rem !important;
-      overflow-y: scroll !important;
-    }
-    .ant-modal-title {
-      font-weight: 600;
-    }
-    .ant-modal-content {
-      .ant-modal-header {
-        border-bottom: 0 !important;
-      }
-    }
+}
+.modalClass {
+  .ant-modal-body {
+    height: 4rem !important;
+    overflow-y: scroll !important;
   }
-  .appModal {
-    .ant-modal-body {
-      height: 4.8rem !important;
-      overflow-y: scroll !important;
-    }
-    .ant-modal-title {
-      font-weight: 600;
-    }
-    .ant-modal-content {
-      .ant-modal-header {
-        border-bottom: 0 !important;
-      }
-    }
+  .ant-modal-title {
+    font-weight: 600;
   }
-  .single-preview-modal {
+  .ant-modal-content {
     .ant-modal-header {
-      background: url(~@/assets/home/video-background.png) no-repeat;
-      background-size: cover;
-    }
-    .ant-modal-title {
-      font-size: 0.16rem;
-      font-weight: 500;
-      color: #ffffff;
-    }
-    .anticon {
-      color: #ffffff;
+      border-bottom: 0 !important;
     }
   }
-  .batch-preview-modal {
-    .batch-video {
-      width: 100%;
-      display: grid;
-      grid-template-columns: 50% 50%;
-      grid-template-rows: 50% 50%;
-      justify-content: center;
-      grid-row-gap: 10px;
-      grid-column-gap: 10px;
-    }
-    .ant-pagination-item-link {
-      background-color: #5580f7;
-    }
+}
+.appModal {
+  .ant-modal-body {
+    height: 4.8rem !important;
+    overflow-y: scroll !important;
+  }
+  .ant-modal-title {
+    font-weight: 600;
+  }
+  .ant-modal-content {
     .ant-modal-header {
-      background: url(~@/assets/home/video-background.png) no-repeat;
-      background-size: cover;
-    }
-    .ant-modal-title {
-      font-size: 0.16rem;
-      font-weight: 500;
-      color: #ffffff;
-    }
-    .anticon {
-      color: #ffffff;
+      border-bottom: 0 !important;
     }
   }
+}
+.single-preview-modal {
+  .ant-modal-header {
+    background: url(~@/assets/home/video-background.png) no-repeat;
+    background-size: cover;
+  }
+  .ant-modal-title {
+    font-size: 0.16rem;
+    font-weight: 500;
+    color: #ffffff;
+  }
+  .anticon {
+    color: #ffffff;
+  }
+}
+.batch-preview-modal {
+  .batch-video {
+    width: 100%;
+    display: grid;
+    grid-template-columns: 50% 50%;
+    grid-template-rows: 50% 50%;
+    justify-content: center;
+    grid-row-gap: 10px;
+    grid-column-gap: 10px;
+  }
+  .ant-pagination-item-link {
+    background-color: #5580f7;
+  }
+  .ant-modal-header {
+    background: url(~@/assets/home/video-background.png) no-repeat;
+    background-size: cover;
+  }
+  .ant-modal-title {
+    font-size: 0.16rem;
+    font-weight: 500;
+    color: #ffffff;
+  }
+  .anticon {
+    color: #ffffff;
+  }
+}
 </style>