diff --git a/back/src/mixins/view-module.js b/back/src/mixins/view-module.js
index 98b075fb..edd9378c 100644
--- a/back/src/mixins/view-module.js
+++ b/back/src/mixins/view-module.js
@@ -107,7 +107,6 @@ export default {
         } else {
           this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total : 0
         }
-
         console.log('数据列表', this.dataList, this.mixinViewModuleOptions.getDataListURL)
         if (this.dataList[0].type === '组件服务') {
           this.dataList.map(val => {
diff --git a/back/src/router/index.js b/back/src/router/index.js
index c386dc1b..08f69ea5 100644
--- a/back/src/router/index.js
+++ b/back/src/router/index.js
@@ -104,7 +104,7 @@ router.beforeEach((to, from, next) => {
       Vue.prototype.$message.error(res.msg)
       return next({ name: 'login' })
     }
-    window.SITE_CONFIG.menuList = res.data
+    window.SITE_CONFIG.menuList = res.data.filter(item => item.site === 0)
     fnAddDynamicMenuRoutes(window.SITE_CONFIG.menuList)
     next({ ...to, replace: true })
   }).catch(() => {
diff --git a/back/src/views/main-sidebar.vue b/back/src/views/main-sidebar.vue
index 40f882b0..62dc4831 100644
--- a/back/src/views/main-sidebar.vue
+++ b/back/src/views/main-sidebar.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: kongjun qdkongjun@gmail.com
  * @Date: 2022-06-20 09:29:59
- * @LastEditors: kongjun qdkongjun@gmail.com
- * @LastEditTime: 2022-06-22 10:04:56
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-10-18 15:22:45
  * @FilePath: \back\src\views\main-sidebar.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -25,7 +25,7 @@
           :menu="menu"
         >
         <span>sdddd</span>
-     
+
         </sub-menu>
       </div>
       </el-menu>
@@ -35,63 +35,71 @@
 
 <script>
 import http from '@/utils/request'
-import SubMenu from "./main-sidebar-sub-menu";
-import returnLocationStr from '@/utils/location';
+import SubMenu from './main-sidebar-sub-menu'
+import returnLocationStr from '@/utils/location'
+import bus from '@/views/bus.js'
 export default {
-  data() {
+  data () {
     return {
-      numObject:{}
-    };
+      numObject: {}
+    }
   },
   components: {
-    SubMenu,
+    SubMenu
   },
-  created() {
+  created () {
     this.getNum()
-    //this.$store.state.sidebarMenuList = window.SITE_CONFIG["menuList"];
+    // this.$store.state.sidebarMenuList = window.SITE_CONFIG["menuList"];
+    // 更新我的待办得数量
+    bus.$off('updateTaskNum')
+    bus.$on('updateTaskNum', () => {
+      this.getNum()
+    })
   },
   methods: {
-    getNum(){
+    getNum () {
       http.get('/act/task/myToDoTaskNum').then(({ data: res }) => {
-    this.numObject=res.data
-   let menuList= window.SITE_CONFIG["menuList"];
-   for(var i=0;i<menuList.length;i++){
-     let menu=menuList[i];
-      if(menu.id=='1541261628388888578'){//我的待办
-        let daibanNum=0
-      for(let j=0;j<menu.children.length;j++){
-        let children=menu.children[j]
-        if(children.id=="1541261780432408577"){//能力申请 v2
-           //西海岸 v2  市局v3
-          children.total= returnLocationStr() == 'qingdao' ? Number(this.numObject.abilityprocess_v3) : Number(this.numObject.abilityprocess_v2)
-         daibanNum=Number(daibanNum)+Number(children.total)
-      } if(children.id=="1559376285703081986"){//会议室审核
-        children.total=Number(this.numObject.meetingroom_book)
-         daibanNum=Number(daibanNum)+Number(children.total)
-      }if(children.id=="1545292602084827138"){//能力资源上架
-        children.total=Number(this.numObject.resourcemountapply)
-         daibanNum=Number(daibanNum)+Number(children.total)
-      }if(children.id=="1545312045695377410"){//能力需求申请
-        children.total=Number(this.numObject.abilitydemandapply)
-         daibanNum=Number(daibanNum)+Number(children.total)
-      }if(children.id=="1545313018614521857"){//能力需求下架
-        children.total=Number(this.numObject.resourcundercarriageapply)
-         daibanNum=Number(daibanNum)+Number(children.total)
-      }if(children.id=="1545313754106699777"){//评论审核
-        children.total=Number(this.numObject.comment_review)
-         daibanNum=Number(daibanNum)+Number(children.total)
-      }if(children.id=="1554294862931562498"){//会议室 暂无
-        children.total=0
-         daibanNum=Number(daibanNum)+Number(children.total)
-      } 
-      }
-      menu.total=daibanNum
+        this.numObject = res.data
+        const menuList = window.SITE_CONFIG.menuList
+        console.log('menuList====>', menuList)
+        console.log('this.numObject====>', this.numObject)
+        for (var i = 0; i < menuList.length; i++) {
+          const menu = menuList[i]
+          if (menu.id == '1541261628388888578') { // 我的待办
+            let daibanNum = 0
+            for (let j = 0; j < menu.children.length; j++) {
+              const children = menu.children[j]
+              if (children.id == '1541261780432408577') { // 能力申请 v2
+                // 西海岸 v2  市局v3
+                children.total = returnLocationStr() == 'qingdao' ? Number(this.numObject.abilityprocess_v3) : Number(this.numObject.abilityprocess_v2)
+                daibanNum = Number(daibanNum) + Number(children.total)
+              } if (children.id == '1559376285703081986') { // 会议室审核
+                children.total = Number(this.numObject.meetingroom_book)
+                daibanNum = Number(daibanNum) + Number(children.total)
+              } if (children.id == '1545292602084827138') { // 能力资源上架
+                children.total = Number(this.numObject.resourcemountapply)
+                daibanNum = Number(daibanNum) + Number(children.total)
+              } if (children.id == '1545312045695377410') { // 能力需求申请
+                children.total = Number(this.numObject.abilitydemandapply)
+                daibanNum = Number(daibanNum) + Number(children.total)
+              } if (children.id == '1545313018614521857') { // 能力需求下架
+                children.total = Number(this.numObject.resourcundercarriageapply)
+                daibanNum = Number(daibanNum) + Number(children.total)
+              } if (children.id == '1545313754106699777') { // 评论审核
+                children.total = Number(this.numObject.comment_review)
+                daibanNum = Number(daibanNum) + Number(children.total)
+              } if (children.id == '1554294862931562498') { // 会议室 暂无
+                children.total = 0
+                daibanNum = Number(daibanNum) + Number(children.total)
+              }
+            }
+            menu.total = daibanNum
+          }
+        }
+      })
     }
   }
-    this.$store.state.sidebarMenuList=menuList
-})
-  }
-}};
+}
 </script>
 <style scoped lang="scss">
 .aui-sidebar {
diff --git a/back/src/views/modules/ability/assignedScene/add-update-scene.vue b/back/src/views/modules/ability/assignedScene/add-update-scene.vue
index 30afbbc0..7feb6844 100644
--- a/back/src/views/modules/ability/assignedScene/add-update-scene.vue
+++ b/back/src/views/modules/ability/assignedScene/add-update-scene.vue
@@ -116,7 +116,6 @@ import CommonQuestion from '../components/common-question.vue'
 import InfrastructureModal from './components/infrastructure-modal.vue'
 import Cookies from 'js-cookie'
 import upload from '@/views/modules/components/upload'
-
 const btnArray = ['基本信息', '场景痛点', '解决方案', '组合能力', '更多能力', '使用步骤']
 // 数据资源\组件服务
 export const getJson = (type) => {
@@ -163,7 +162,6 @@ export const modalTypeText = {
 }
 
 export const getFuseResourceList = (abilityListObj) => {
-  console.log('abilityListObjabilityListObj',abilityListObj);
   const arr = []
   let length = 0
   for (const key in abilityListObj) {
@@ -176,7 +174,7 @@ export const getFuseResourceList = (abilityListObj) => {
           resourceId: v.id,
           type: key,
           sequence: index,
-          resourceName:v.resourceName,
+          resourceName:v.resourceName|| v.name ,
           deptName:v.deptName,
         })
       })
@@ -331,9 +329,10 @@ export default {
     },
     // 更新表单
     updateDataForm (data) {
-      console.log('datadatadata',data);
+      //console.log('datadatadata',data);
       if (Object.keys(this.getListParams).includes(data.title)) {
         this.abilityListObj[data.title] = data.list
+        console.log(' this.abilityListObj[data.title]3333', this.abilityListObj[data.title]);
       } else {
         // 更多能力、使用步骤
         this.operateFuseAttrList(data.title, data)
@@ -363,6 +362,7 @@ export default {
     // 表单提交
     dataFormSubmitHandle: debounce(
       function () {
+          console.log('this.dataForm------表单提交------>111111', this.dataForm)
         this.$refs.dataForm.validate((valid) => {
           if (!valid) {
             this.$message.error('请检查表单是否填写完整')
diff --git a/back/src/views/modules/ability/components/combine-ability.vue b/back/src/views/modules/ability/components/combine-ability.vue
index 78c068b4..f0a1b8e6 100644
--- a/back/src/views/modules/ability/components/combine-ability.vue
+++ b/back/src/views/modules/ability/components/combine-ability.vue
@@ -16,19 +16,20 @@
               </el-transfer>
             </div>
             <div v-else-if="type==='数据资源'"  class="dataTransfer">
-              <el-transfer v-model="selectedArray" filterable :filter-method="filterMethod" filter-placeholder="请输入名称"
+              <!-- <el-transfer v-model="selectedArray" filter-placeholder="请输入名称"
                     :titles="nameArray" :props="{
                         key: 'id',
                         label: 'name',
                     }" :data="transferData">
                 </el-transfer>
-                <!-- <el-input
+                <el-input
                   v-model="searchValue"
                   placeholder="请输入名称"
                 ></el-input>
                 <el-button @click="rest" class="restClick">重置</el-button> -->
+                 <data-resource-tranfer @updateData="updateResourceDataForm" :selected-data="selectedData" :type="type"></data-resource-tranfer>
             </div>
-            <el-pagination
+            <!-- <el-pagination
               v-if="type==='数据资源'"
               :current-page="currentPage"
               :page-size="15"
@@ -36,7 +37,7 @@
               :total="total"
               @current-change="pageCurrentChangeHandle"
             >
-            </el-pagination>
+            </el-pagination> -->
             <template slot="footer">
                 <el-button @click="showModal = false">{{ $t("cancel") }}</el-button>
                 <el-button type="primary" @click="confirmSubmitHandle()">{{
@@ -52,7 +53,7 @@
 <script>
 import InfrastructureModal from '../assignedScene/components/infrastructure-modal.vue'
 import DisplayList from '../assignedScene/components/display-list.vue'
-
+import dataResourceTranfer from './data-resource-tranfer.vue'
 const sjzyArray = [
   {
     zyname: '城阳区图书馆总分馆、社区图书室明细信息',
@@ -199,7 +200,9 @@ export default {
       total: 0,
       currentPage: 1,
       newNum: 1,
-      searchValue: ''
+      searchValue: '',
+      selectedData:[],
+      newResourceData:[]
     }
   },
   watch: {
@@ -223,10 +226,12 @@ export default {
   },
   methods: {
     async getDataInfo (dataForm) {
+       console.log('dataForm-----====',dataForm);
+       console.log('this.type',this.type);
       await this.getData()
       const arr = []
       const attrValue = dataForm.fuseResourceList.filter(v => v.type == this.type);
-       console.log('attrValue22',attrValue);
+      this.selectedData = attrValue;
       if (attrValue.length > 0) {
         attrValue.map(val => {
           if(val.type==="数据资源"){
@@ -248,6 +253,7 @@ export default {
       }
       // 展示
       this.displayList = JSON.parse(JSON.stringify(arr));
+      this.displayList = Array.from(new Set(this.displayList))
       // 已选中
       this.selectedArray = arr.map(v => v.id)
       this.$nextTick(() => {
@@ -286,7 +292,7 @@ export default {
         this.$http[this.getDataParams.methods](this.getDataParams.url,
           this.getDataParams.postData
         ).then(res => {
-          console.log('res.data----获取列表-------->', res.data)
+          console.log('res.data----数据资源获取列表-------->', res.data)
           this.total = Number(res.data.data.rows)
           if (res.data.code !== 0) {
             return this.$message.error(res.msg)
@@ -302,37 +308,56 @@ export default {
               resourceName:v.zyname
             })
           })
-          this.allData = JSON.parse(JSON.stringify(this.transferData))
+          this.allData = JSON.parse(JSON.stringify(this.transferData));
+          //console.log('this.transferData======43434',this.transferData);
+          //console.log('res.data----retretryry-------->', this.transferData)
         }).catch(err => {
           this.$message.error('未搜索到相关数据资源')
         })
       }
     },
+    //接受数据资源数据
+    updateResourceDataForm(data){
+      let obj = {};
+      data =  data.list.reduce(function(item, next) {
+      obj[next.id] ? '' : obj[next.id] = true && item.push(next);
+       return item;
+       }, []);
+      console.log('变化后的数据222',data); 
+      this.newResourceData = data;
+    },
     filterMethod (query, item) {
       console.log('1111111111111111111111111')
       return item.name && item.name.indexOf(query) > -1
     },
     confirmSubmitHandle () {
-      console.log('tttttt',this.selectedArray)
       if(this.type === "数据资源"){
        //通过选中的数据去查找原始列表数据
-      let selectedObjectList = [];
-      this.selectedArray.forEach((item)=>{
-        let filterData = [];
-        filterData = this.allData.filter(v => v.id == item);
-        //console.log('filterDatafilterData',filterData);
-        selectedObjectList.push(filterData[0]);
-      });
-       this.$emit('update', {
-        title: this.type,
-        list: selectedObjectList
-      })
+      // let selectedObjectList = [];
+      // this.selectedArray.forEach((item)=>{
+      //   let filterData = [];
+      //   filterData = this.allData.filter(v => v.id == item);
+      //   //console.log('filterDatafilterData',filterData);
+      //   selectedObjectList.push(filterData[0]);
+      // });
+      //  this.$emit('update', {
+      //   title: this.type,
+      //   list: selectedObjectList
+      // })
+       if (this.newResourceData.length > this.maxNum) {
+        return this.$message.error('最多选择十条数据！')
+      }
+      this.$emit('update', {
+         title: this.type,
+         list: this.newResourceData
+       });
+        this.displayList = this.newResourceData;
+       this.showModal = false
       }else{
         this.$emit('update', {
         title: this.type,
         list: this.selectedArray
       })
-      }
       if (this.selectedArray.length > this.maxNum) {
         return this.$message.error('最多选择十条数据！')
       }
@@ -343,7 +368,9 @@ export default {
           this.displayList.push(v)
         }
       })
+      this.displayList = Array.from(new Set(this.displayList))
       console.log(this.selectedArray, this.displayList, 'this.displayList')
+      }
     },
     handleChange(){
       //console.log('222222',this.selectedArray);
@@ -376,9 +403,10 @@ export default {
       this.getData()
     }
   },
-  components: { InfrastructureModal, DisplayList },
+  components: { InfrastructureModal, DisplayList,dataResourceTranfer },
   mounted () {
     console.log(this.type, 'this.type')
+    
   }
 }
 </script>
@@ -493,7 +521,7 @@ export default {
     position: absolute;
     font-size: 14px;
     display: inline-block;
-    width: 80%;
+    width: 30%;
     top: 52px;
     left: 12px;
   }
diff --git a/back/src/views/modules/ability/components/data-resource-tranfer.vue b/back/src/views/modules/ability/components/data-resource-tranfer.vue
new file mode 100644
index 00000000..d6a89dcc
--- /dev/null
+++ b/back/src/views/modules/ability/components/data-resource-tranfer.vue
@@ -0,0 +1,415 @@
+<template>
+  <div class="transfer">
+    <div class="leftTransfer">
+      <div class="leftTransfer_title">
+        <el-checkbox
+          :indeterminate="left.isIndeterminate"
+          v-model="left.checkAll"
+          @change="leftHandleCheckAllChange"
+          >{{ titles[0] }}</el-checkbox
+        >
+        <span
+          >{{ left.transferDataChecked.length }}/{{
+            left.transferData.length
+          }}</span
+        >
+      </div>
+      <el-input
+        @input="transferInputLeft"
+        class="transfer_input"
+        placeholder="请输入内容"
+        prefix-icon="el-icon-search"
+        v-model="left.inputValue"
+      >
+      </el-input>
+      <el-checkbox-group
+        class="transfer_group"
+        v-model="left.transferDataChecked"
+        @change="leftHandleCheckedCitiesChange"
+      >
+        <el-checkbox
+          v-for="item in left.transferData"
+          :label="item"
+          :key="item[defaultProps.id]"
+          >{{ item[defaultProps.label] }}</el-checkbox
+        >
+      </el-checkbox-group>
+      <el-pagination
+              :current-page="currentPage"
+              :page-size="15"
+              layout="total, prev, pager, next"
+              :total="total"
+              @current-change="handleCurrentChange"
+            >
+            </el-pagination>
+    </div>
+    <div class="transferButton">
+      <el-button type="primary" @click="push">></el-button>
+      <el-button type="primary" @click="del">{{ "<" }}</el-button>
+    </div>
+    <div class="rightTransfer">
+      <div class="rightTransfer_title">
+        <el-checkbox
+          :indeterminate="right.isIndeterminate"
+          v-model="right.checkAll"
+          @change="rightHandleCheckAllChange"
+          >{{ titles[1] }}</el-checkbox
+        >
+        <span
+          >{{ right.transferDataChecked.length }}/{{
+            right.transferData.length
+          }}</span
+        >
+      </div>
+      <el-input
+        @input="transferInputRight"
+        class="transfer_input"
+        placeholder="请输入内容"
+        prefix-icon="el-icon-search"
+        v-model="right.inputValue"
+      >
+      </el-input>
+      <div style="margin: 5px 0"></div>
+      <el-checkbox-group
+        class="transfer_group"
+        v-model="right.transferDataChecked"
+        @change="rightHandleCheckedCitiesChange"
+      >
+        <el-checkbox
+          v-for="item in right.transferData"
+          :label="item"
+          :key="item[defaultProps.id]"
+          >{{ item[defaultProps.label] }}</el-checkbox
+        >
+      </el-checkbox-group>
+    </div>
+  </div>
+</template>
+ 
+<script>
+//import { listUser } from "@/api/system/user";
+export default {
+  name: "transferPage",
+  props: {
+    titles: {
+      type: Array,
+      default: () => ["待选列表", "已选列表"],
+    },
+      selectedData: {
+      type: Array,
+      default: () => []
+    },
+    type: {
+      type: String,
+      default: ''
+    },
+  },
+  data() {
+    return {
+      left: {
+        inputValue: "",
+        isIndeterminate: false, //半选按钮
+        checkAll: false, //是否点击全选
+        transferData: [], //穿梭框左侧全部数据
+        transferDataAll: [], //穿梭框左侧全部数据记录
+        transferDataChecked: [], //穿梭框左侧选中数据
+      },
+      right: {
+        inputValue: "",
+        isIndeterminate: false, //半选按钮
+        checkAll: false, //是否点击全选
+        transferData: [], //穿梭框右侧全部数据
+        transferDataAll: [], //穿梭框左侧全部数据记录
+        transferDataChecked: [], //穿梭框右侧选中数据
+      },
+      total: 0,
+       currentPage: 1,
+      queryParams: {
+        current: 1,
+        size: 10,
+      },
+    getDataParams:{ 
+    methods: "post",
+    url: "/resource/getDataResource",
+    postData: {
+        serviceName: "",
+        orderField: "fbrq",
+        orderType: "desc",
+        pageNum: 1,
+        pageSize: 15
+    }
+      },
+      defaultProps: {
+        label: "name",
+        id: "id",
+      },
+    };
+  },
+  created() {
+    this.initTransferData();
+  },
+	watch: {
+    // selectedData:{
+    //   	handler (newName, oldName) {
+		// 			console.log('接受到的已经选中的值',newName);
+    //       this.right.transferData = newName
+		// 		}
+    // },
+			right: {
+				handler (newName, oldName) {
+					//console.log('nnnnnn传递过去的值',newName);
+            this.$emit('updateData', {
+            title: "选中的数据资源",
+            list: newName.transferData
+      })
+				},
+				immediate: false,
+        deep: true
+			}
+		},
+  methods: {
+    // 初始化数据
+    initTransferData() {
+     this.$http[this.getDataParams.methods](this.getDataParams.url,
+          this.getDataParams.postData
+        ).then(response => {
+          console.log('数据资源response---->',response.data.data.data);
+          let responseDataList = [];
+            (response.data.data.data || []).map(v => {
+            responseDataList.push({
+              type: this.type,
+              id: v.guid,
+              name: v.zyname || '--',
+              deptName:v.TGBM,
+              resourceName:v.zyname
+            })
+          });
+        this.left.transferData = responseDataList;
+        this.left.transferData.map((item, index) => {
+          item.current = this.currentPage;
+        });
+        this.total =  Number(response.data.data.rows);
+        this.left.transferDataAll = this.left.transferData;
+        // 获得一个右边的数据，只有纯id
+        let checkedIdArr = this.right.transferData.map((item) => {
+          return item[this.defaultProps.id];
+        });
+        // 左侧数据删除
+        this.left.transferData = this.left.transferData.filter((item) => {
+          if (!checkedIdArr.includes(item[this.defaultProps.id])) {
+            return item;
+          }
+        });
+      });
+      let selectedDataRight = [];
+      this.selectedData = JSON.parse(JSON.stringify(this.selectedData));
+        (this.selectedData || []).map(v => {
+            selectedDataRight.push({
+              type: v.resource.type,
+              id: v.resource.resourceId,
+              name: v.resource.resourceName,
+              deptName:v.resource.deptName,
+            })
+          });
+          selectedDataRight.map(v => {
+            this.right.transferData.push(v);
+          });
+       let obj = {};
+       this.right.transferData =   this.right.transferData.reduce(function(item, next) {
+       obj[next.id] ? '' : obj[next.id] = true && item.push(next);
+        return item;
+        }, []);
+        this.right.transferDataAll = this.right.transferData;
+       //console.log('this.selectedData',this.selectedData);
+       //console.log('left',this.left);
+       //console.log('rigth',this.right);
+    },
+    // 左侧是否点击全选
+    leftHandleCheckAllChange(val) {
+      this.left.transferDataChecked = val ? this.left.transferData : [];
+      this.left.isIndeterminate = false;
+    },
+    // 左侧勾选数据
+    leftHandleCheckedCitiesChange(value) {
+      let checkedCount = value.length;
+      this.left.checkAll = checkedCount === this.left.transferData.length;
+      this.left.isIndeterminate =
+        checkedCount > 0 && checkedCount < this.left.transferData.length;
+    },
+    // 左侧是否点击全选
+    rightHandleCheckAllChange(val) {
+      this.right.transferDataChecked = val ? this.right.transferData : [];
+      this.right.isIndeterminate = false;
+    },
+    // 右侧勾选数据
+    rightHandleCheckedCitiesChange(value) {
+      let checkedCount = value.length;
+      this.right.checkAll = checkedCount === this.right.transferData.length;
+      this.right.isIndeterminate =
+        checkedCount > 0 && checkedCount < this.right.transferData.length;
+    },
+    // 穿梭框选中数据
+    push() {
+      // 数据移到右侧
+      this.right.transferData = [
+        ...this.right.transferData,
+        ...this.left.transferDataChecked,
+      ].sort((a, b) => {
+        return a[this.defaultProps.id] - b[this.defaultProps.id];
+      });
+      this.right.transferDataAll = this.right.transferData;
+      // 获得一个右边的数据，只有纯id
+      let checkedIdArr = this.right.transferData.map((item) => {
+        return item[this.defaultProps.id];
+      });
+      // 左侧数据删除
+      this.left.transferData = this.left.transferData.filter((item) => {
+        if (!checkedIdArr.includes(item[this.defaultProps.id])) {
+          return item;
+        }
+      });
+      this.left.transferDataAll = this.left.transferData;
+      // 每次推送完之后，重置选中框
+      this.left.transferDataChecked = [];
+      this.left.isIndeterminate = false;
+      this.left.checkAll = false;
+    },
+    // 穿梭框删除数据 回显的时候根据current回显到当前
+    del() {
+      //过滤当前页选中的数据
+      let arr = this.right.transferDataChecked.filter((item) => {
+        if (this.queryParams.current == item.current) {
+          return item;
+        }
+      });
+      // 数据移到左侧
+      this.left.transferData = [...this.left.transferData, ...arr].sort(
+        (a, b) => {
+          return a[this.defaultProps.id] - b[this.defaultProps.id];
+        }
+      );
+      this.left.transferDataAll = this.left.transferData;
+      // 获得一个右边的数据，只有纯id
+      let checkedIdArr = this.right.transferDataChecked.map((item) => {
+        return item[this.defaultProps.id];
+      });
+      // 删除选中的数据
+      this.right.transferData = this.right.transferData.filter((item) => {
+        if (!checkedIdArr.includes(item[this.defaultProps.id])) {
+          return item;
+        }
+      });
+      this.right.transferDataAll = this.right.transferData;
+      // 每次推送完之后，重置选中框
+      this.right.transferDataChecked = [];
+      this.right.isIndeterminate = false;
+      this.right.checkAll = false;
+    },
+    handleCurrentChange(val) {
+      //console.log('valval',val);
+      this.getDataParams.postData.pageNum = val;
+      this.initTransferData();
+    },
+    transferInputLeft() {
+      if (this.left.inputValue) {
+        this.left.transferData = this.left.transferData.filter(
+          (p) => p[this.defaultProps.label].indexOf(this.left.inputValue) !== -1
+        );
+      } else {
+        this.left.transferData = this.left.transferDataAll;
+      }
+    },
+    transferInputRight() {
+      if (this.right.inputValue) {
+        this.right.transferData = this.right.transferData.filter(
+          (p) =>
+            p[this.defaultProps.label].indexOf(this.right.inputValue) !== -1
+        );
+      } else {
+        this.right.transferData = this.right.transferDataAll;
+      }
+    },
+  },
+};
+</script>
+ 
+<style lang="scss" scoped>
+.transfer {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin: 0 auto;
+  .transferButton {
+    .el-button {
+      display: block;
+      margin: 10px 0;
+    }
+  }
+  .el-checkbox {
+    line-height: 30px;
+  }
+  .transfer_input {
+    margin: 10px 15px 0 15px;
+    width: 85%;
+    .el-input--medium .el-input__inner {
+      height: 36px;
+      line-height: 36px;
+      border-radius: 16px;
+    }
+  }
+  .leftTransfer,
+  .rightTransfer {
+    height: 510px;
+    border: 1px solid #e6ebf5;
+    border-radius: 4px;
+    overflow: hidden;
+    background: #ffffff;
+    display: inline-block;
+    vertical-align: middle;
+    width: 360px;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    position: relative;
+    margin: 0 10px;
+ 
+    .el-checkbox {
+      display: block;
+    }
+    .el-input {
+    position: absolute;
+    font-size: 14px;
+    display: inline-block;
+    width: 70%;
+    top: 40px;
+    }
+    .pagination {
+      position: absolute;
+      bottom: -8px;
+      right: 0;
+    }
+    .leftTransfer_title,
+    .rightTransfer_title {
+      display: flex;
+      justify-content: space-between;
+      height: 40px;
+      line-height: 40px;
+      background: #f5f7fa;
+      margin: 0;
+      padding-left: 15px;
+      border-bottom: 1px solid #e6ebf5;
+      -webkit-box-sizing: border-box;
+      box-sizing: border-box;
+      color: #000000;
+      padding-right: 15px;
+      align-items: center;
+    }
+  }
+}
+.transfer_group {
+  padding-left: 15px;
+  margin-top: 50px;
+    height: 390px;
+    overflow-y: auto;
+}
+</style>
\ No newline at end of file
diff --git a/back/src/views/modules/abilityStatistics/components/abilityDetails.vue b/back/src/views/modules/abilityStatistics/components/abilityDetails.vue
index 0783f165..9a72879f 100644
--- a/back/src/views/modules/abilityStatistics/components/abilityDetails.vue
+++ b/back/src/views/modules/abilityStatistics/components/abilityDetails.vue
@@ -88,16 +88,49 @@
     <!--审批详情-->
     <div>
       <div class="title">审批详情</div>
-      <div v-for="item in this.dataSource.data" :key="item">
-        <a-table :dataSource="item[1]" :columns="columns">
+      <!-- <div v-for="item in this.dataSource.data" :key="item"> -->
+        <!-- <a-table :dataSource="item[1]" :columns="columns">
           <template #bodyCell="{ column, text }">
             <template v-if="column.dataIndex === 'name'">
               <a>{{ text }}</a>
             </template>
           </template>
-        </a-table>
+        </a-table> -->
+        <el-table 
+      :data="dataSource.data[0][1]"
+      style="width: 100%">
+      <el-table-column
+        prop="activityName"
+        label="任务名称"
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="assigneeName"
+        label="处理人"
+        width="120">
+      </el-table-column>
+      <el-table-column
+        prop="startTime"
+        label="任务开始时间"
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="endTime"
+        label="任务结束时间"
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="comment"
+        label="审核意见" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column
+        prop="duration"
+        label="任务时长"
+        width="100">
+      </el-table-column>
+      </el-table>
       </div>
-    </div>
+    <!-- </div> -->
     <!-- <div else>
        gai
      </div> -->
@@ -228,6 +261,7 @@ export default {
           }
         }
       }
+      console.log("this.dataSource.data[0]========",this.dataSource.data[0][1])
     },
     //   init () {
     //     this.visible = true
diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue
index e95ec4b3..75686078 100644
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@@ -38,7 +38,7 @@
           </el-date-picker>
         </el-form-item>
         <!--审核状态-->
-        <el-form-item>
+        <el-form-item >
           <span>审核状态：</span>
           <el-select
             v-model="examineStatus"
@@ -46,8 +46,9 @@
             clearable
           >
           <el-option label="全部" value="-1"></el-option>
-            <el-option label="审核完成" value="1"></el-option>
-            <el-option label="审核中" value="0"></el-option>
+          <el-option label="审核中" value="0"></el-option>
+            <el-option  label="通过" value="1"></el-option>
+            <el-option  label="不通过" value="2"></el-option>
           </el-select>
         </el-form-item>
 
@@ -371,8 +372,9 @@ export default {
         { name: '组件服务', key: 1 },
         { name: '应用资源', key: 2 },
         { name: '基础设施', key: 3 },
-        { name: '数据资源', key: 3 },
-        { name: '知识库', key: 3 }
+        { name: '数据资源', key: 4 },
+        { name: '知识库', key: 5 },
+        { name: '会议室', value: 6}
       ],
       tableData: [],
       tableData2: [
@@ -396,7 +398,8 @@ export default {
         { name: '图层服务', value: 2 },
         { name: '通用开发组件', value: 3 },
         { name: '页面开发组件', value: 4 },
-        { name: '应用资源', value: 5 }
+        { name: '应用资源', value: 5 },
+        { name: '会议室', value: 6}
       ], // 类型备选列表
       detailFlag: false, // 明细返回按钮显示标志位
       startDate: '', // 开始时间
@@ -478,7 +481,9 @@ export default {
       } else if (this.examineStatus == '0') {
         this.status = '审核中'
       } else if (this.examineStatus == '1') {
-        this.status = '审核完成'
+        this.status = '通过'
+      }else if (this.examineStatus == '2') {
+        this.status = '不通过'
       } else {
         this.status = this.examineStatus
       }
@@ -534,7 +539,9 @@ export default {
       } else if (this.examineStatus == '0') {
         this.status = '审核中'
       } else if (this.examineStatus == '1') {
-        this.status = '审核完成'
+        this.status = '通过'
+      } else if (this.examineStatus == '2') {
+        this.status = '不通过'
       } else {
         this.status = this.examineStatus
       }
@@ -627,13 +634,15 @@ export default {
     },
     // 能力上架明细
     getOneDetail (page) {
-      var passAndReview = '' // 转变"审核完成"字段为通过
+      var passAndReview = '' // 转变"通过"字段为通过
       if (this.examineStatus == '-1') {
         this.status = ''
       } else if (this.examineStatus == '0') {
         this.status = '审核中'
       } else if (this.examineStatus == '1') {
         this.status = '通过'
+      }  else if (this.examineStatus == '2') {
+        this.status = '不通过'
       } else {
         this.status = this.examineStatus
       }
@@ -657,13 +666,15 @@ export default {
     },
     // 能力使用明细
     getTwoDetail (page) {
-      var passAndReview = '' // 转变"审核完成"字段为通过
+      var passAndReview = '' // 转变"通过"字段为通过
       if (this.examineStatus == '-1') {
         this.status = ''
       } else if (this.examineStatus == '0') {
         this.status = '审核中'
       } else if (this.examineStatus == '1') {
         this.status = '通过'
+      } else if (this.examineStatus == '2') {
+        this.status = '不通过'
       } else {
         this.status = this.examineStatus
       }
diff --git a/back/src/views/modules/devtools/generator-menu.vue b/back/src/views/modules/devtools/generator-menu.vue
index f940b8c5..c68eec82 100644
--- a/back/src/views/modules/devtools/generator-menu.vue
+++ b/back/src/views/modules/devtools/generator-menu.vue
@@ -81,7 +81,7 @@ export default {
     init () {
       this.visible = true
       this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
+        this.$refs.dataForm.resetFields()
         this.iconList = getIconList()
         this.dataForm.parentName = this.$t('menu.parentNameDefault')
         this.getMenuList()
@@ -89,11 +89,12 @@ export default {
     },
     // 获取菜单列表
     getMenuList () {
+      console.log('获取菜单位置1')
       return this.$http.get('/sys/menu/list?type=0').then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
-        this.menuList = res.data
+        this.menuList = res.data.filter(item => item.site === 0)
       }).catch(() => {})
     },
     // 上级菜单树, 设置默认值
@@ -114,11 +115,11 @@ export default {
     },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
+      this.$refs.dataForm.validate((valid) => {
         if (!valid) {
           return false
         }
-        this.$http['post']('/devtools/menu', this.dataForm).then(({ data: res }) => {
+        this.$http.post('/devtools/menu', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
@@ -133,7 +134,7 @@ export default {
           })
         }).catch(() => {})
       })
-    }, 1000, { 'leading': true, 'trailing': false })
+    }, 1000, { leading: true, trailing: false })
   }
 }
 </script>
@@ -174,4 +175,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/back/src/views/modules/hasToDoTasks/deviceApproval.vue b/back/src/views/modules/hasToDoTasks/deviceApproval.vue
index 9f71809e..b00832db 100644
--- a/back/src/views/modules/hasToDoTasks/deviceApproval.vue
+++ b/back/src/views/modules/hasToDoTasks/deviceApproval.vue
@@ -38,6 +38,9 @@
                     </template>
                 </el-table-column>
 
+                <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
+                <el-table-column prop="auditTime" label="审核时间" header-align="center" align="center"></el-table-column>
+
                 <el-table-column label="应用领域" header-align="center" align="center">
                     <template slot-scope="scope" v-if="scope.row.applicationArea">
                         <span class="area-text" v-for="(x,i) in JSON.parse(scope.row.applicationArea)"
diff --git a/back/src/views/modules/myAgent/CompetencyApplication.vue b/back/src/views/modules/myAgent/CompetencyApplication.vue
index 930ae3d4..8c8118c9 100644
--- a/back/src/views/modules/myAgent/CompetencyApplication.vue
+++ b/back/src/views/modules/myAgent/CompetencyApplication.vue
@@ -47,6 +47,13 @@
             }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="申请人所属部门" header-align="center" align="center">
+          <template slot-scope="scope">
+            <span>{{
+              (scope.row.params && scope.row.params.tAbilityApplicationDTOList[0].unit)
+            }}</span>
+          </template>
+        </el-table-column>
         <el-table-column
           :label="$t('process.system')"
           header-align="center"
@@ -161,7 +168,8 @@ export default {
   created () {
     bus.$off('competencyApplicationInit')
     bus.$on('competencyApplicationInit', () => {
-      this.getDataList()
+      this.getDataList();
+      bus.$emit('updateTaskNum')
     })
   }
 }
diff --git a/back/src/views/modules/myAgent/approval.vue b/back/src/views/modules/myAgent/approval.vue
index 2cd53901..df7d42cd 100644
--- a/back/src/views/modules/myAgent/approval.vue
+++ b/back/src/views/modules/myAgent/approval.vue
@@ -12,15 +12,23 @@
             <el-table v-loading="dataListLoading" :data="dataList" border style="width: 100%">
                 <el-table-column prop="title" label="申请标题" header-align="center" align="center"></el-table-column>
                 <el-table-column prop="name" label="申请人信息" header-align="center" align="center"></el-table-column>
+                <el-table-column label="设备名称" header-align="center" align="center">
+                    <template slot-scope="scope">
+                        <span class="demand-text">{{
+                        (scope.row && scope.row.tbDeviceDTO && scope.row.tbDeviceDTO.name)
+                        }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="state" label="审批状态" header-align="center" align="center">
                     <template slot-scope="scope">
                         <span>{{wrjStateObj[scope.row.state]}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="phone" label="电话" header-align="center" align="center"></el-table-column>
+                <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
+                <!-- <el-table-column prop="phone" label="电话" header-align="center" align="center"></el-table-column>
                 <el-table-column prop="dept" label="单位" header-align="center" align="center"></el-table-column>
                 <el-table-column prop="applicationSystem" label="应用系统" header-align="center" align="center">
-                </el-table-column>
+                </el-table-column> -->
                 <el-table-column label="应用领域" header-align="center" align="center">
                     <template slot-scope="scope" v-if="scope.row.applicationArea">
                         <span class="area-text" v-for="(x,i) in JSON.parse(scope.row.applicationArea)"
diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue
index 52874502..9e788e19 100644
--- a/back/src/views/modules/myAgent/demo/competency-application.vue
+++ b/back/src/views/modules/myAgent/demo/competency-application.vue
@@ -13,40 +13,32 @@
       <h3>申请人信息</h3>
       <div class="big-BOX">
         <p>
-          <span class="text"
-            >申请人：<span> {{ dataForm.content.user || '--' }}</span></span
-          >
-          <span class="text"
-            >电话：<span>{{ dataForm.content.phone || '--' }}</span></span
-          >
-          <span class="text"
-            >单位：<span>{{ dataForm.content.unit || '--' }}</span></span
-          >
+          <span class="text">申请人：<span> {{ dataForm.content.user || '--' }}</span></span>
+          <span class="text">电话：<span>{{ dataForm.content.phone || '--' }}</span></span>
+          <span class="text">单位：<span>{{ dataForm.content.unit || '--' }}</span></span>
         </p>
         <p>
           <span class="text">
             能力申请标题：<span>
-              {{ dataForm.content.title || '--' }}</span
-            ></span
-          >
-          <span class="text" v-if="dataForm.content.applicationSystem"
-            >应用系统：<span>{{
-              dataForm.content.applicationSystem || '--'
-            }}</span></span
-          >
-          <span class="text" ></span>
+              {{ dataForm.content.title || '--' }}</span></span>
+          <span class="text" v-if="dataForm.content.applicationSystem">应用系统：<span>{{
+          dataForm.content.applicationSystem || '--'
+          }}</span></span>
+          <span class="text"></span>
         </p>
         <p>
-          <span v-if="dataForm.content.applicationSceneStr"
-            >应用场景：<span>
-              {{ dataForm.content.applicationSceneStr || '--' }}</span
-            ></span>
+          <span v-if="dataForm.content.applicationSceneStr">应用场景：<span>
+              {{ dataForm.content.applicationSceneStr || '--' }}</span></span>
         </p>
         <p>
           <span>
             需求依据：<span>
-              {{ dataForm.content.applicationBackground || '--' }}</span
-            ></span>
+              {{ dataForm.content.applicationBackground || '--' }}</span></span>
+        </p>
+        <p>
+          <div>
+            <el-button type="primary" v-if="dataForm.content.attachment" size="small" @click="download(dataForm.content)">附件下载</el-button>
+          </div>
         </p>
         <!-- <p>
           <span>
@@ -102,9 +94,7 @@
           <el-radio-button label="退回" class="redAll" @click="showDialog('退回')">退回</el-radio-button>
         </el-radio-group> -->
         <el-button type="primary" @click="showDialog('同意')">同意</el-button>
-        <el-button type="danger" plain @click="showDialog('驳回')"
-          >驳回</el-button
-        >
+        <el-button type="danger" plain @click="showDialog('驳回')">驳回</el-button>
         <!-- <el-input v-if="agreeOrList ==='同意' " v-model="inputAgree" placeholder="请输入同意意见"></el-input>
         <el-input v-if="agreeOrList ==='退回'" v-model="inputNo" placeholder="请输入退回意见"></el-input>
          <el-button class="inputBule" @click="agreeOrNot">提交</el-button> -->
@@ -113,21 +103,12 @@
 
     <!--  流程详情   -->
     <ren-process-detail></ren-process-detail>
-    <el-dialog
-      title="审批意见"
-      :close-on-click-modal="false"
-      :visible.sync="dialogVisible"
-      width="30%"
-      :before-close="handleClose"
-    >
+    <el-dialog title="审批意见" :close-on-click-modal="false" :visible.sync="dialogVisible" width="30%"
+      :before-close="handleClose">
       <el-input v-model="input" placeholder="请输入审批意见"></el-input>
       <span slot="footer" class="dialog-footer">
         <el-button @click="handleClose2">取 消</el-button>
-        <el-button
-          type="primary"
-          @click.native="agreeOrNot($store.state.contentTabsActiveName)"
-          >确 定</el-button
-        >
+        <el-button type="primary" @click.native="agreeOrNot($store.state.contentTabsActiveName)">确 定</el-button>
       </span>
     </el-dialog>
   </el-card>
@@ -144,7 +125,7 @@ import bus from '@/views/bus.js'
 export default {
   // 注入公共方法
   mixins: [processModule],
-  data () {
+  data() {
     return {
       dialogVisible: false,
       dialogType: '',
@@ -173,7 +154,7 @@ export default {
       agreeOrList: '同意'
     }
   },
-  created () {
+  created() {
     // 将业务KEY赋值给表单
     console.log('params=================>', this.$route, this.$route.params)
     this.dataForm.taskId = this.$route.params.taskId
@@ -207,7 +188,7 @@ export default {
     RenProcessDetail
   },
   methods: {
-    init () {
+    init() {
       // this.visible = true
       this.$nextTick(() => {
         // this.$refs.dataForm.resetFields()
@@ -219,32 +200,32 @@ export default {
         }
       })
     },
-    showDialog (title) {
+    showDialog(title) {
       this.dialogVisible = true
       this.dialogType = title
     },
-    handleClose (done) {
+    handleClose(done) {
       this.$confirm('确认关闭？')
         .then((_) => {
           this.input = ''
           done()
         })
-        .catch((_) => {})
+        .catch((_) => { })
     },
-    handleClose2 () {
+    handleClose2() {
       this.dialogVisible = false
       this.input = ''
     },
-    downloadFile2 (url) {
+    downloadFile2(url) {
       console.log(window.SITE_CONFIG.previewUrl)
       window.open(
         window.SITE_CONFIG.previewUrl +
-          'hisense_office/onlinePreview?url=' +
-          btoa(encodeURI(url))
+        'hisense_office/onlinePreview?url=' +
+        btoa(encodeURI(url))
       )
     },
     // 获取信息
-    getInfo () {
+    getInfo() {
       let params = ''
       if (this.dataForm.taskId) {
         params = `taskId=${this.dataForm.taskId}`
@@ -272,7 +253,7 @@ export default {
                     index <
                     res.data.tAbilityApplicationDTOList[0].applicationScene
                       .length -
-                      1
+                    1
                   ) {
                     res.data.tAbilityApplicationDTOList[0].applicationSceneStr +=
                       '、'
@@ -307,7 +288,7 @@ export default {
               this.dataList.push(obj)
             }
           })
-          .catch(() => {})
+          .catch(() => { })
       } else {
         params = `instanceId=${this.dataForm.instanceId}`
         this.$http
@@ -359,11 +340,11 @@ export default {
               this.dataList.push(obj)
             }
           })
-          .catch(() => {})
+          .catch(() => { })
       }
     },
     // 申请能力
-    applyData () {
+    applyData() {
       this.$http
         .get(`/resource/select/${this.dataForm.instanceId}`)
         .then(({ data: res }) => {
@@ -375,7 +356,7 @@ export default {
           // this.dataForm.content = res.data
           // console.log(this.dataForm, 'ela')
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     // 同意与退回
     agreeOrNot: debounce(
@@ -412,7 +393,7 @@ export default {
                   }
                 })
               })
-              .catch(() => {})
+              .catch(() => { })
             this.tabRemoveHandle(data)
           } else {
             this.$message.error('请输入审批意见！')
@@ -455,7 +436,7 @@ export default {
       1000,
       { leading: true, trailing: false }
     ),
-    tabRemoveHandle (tabName) {
+    tabRemoveHandle(tabName) {
       console.log(tabName, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
       if (tabName === 'home') {
         return false
@@ -472,7 +453,7 @@ export default {
       if (tabName === this.$store.state.contentTabsActiveName) {
         const tab =
           this.$store.state.contentTabs[
-            this.$store.state.contentTabs.length - 1
+          this.$store.state.contentTabs.length - 1
           ]
         this.$router.push({
           name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name,
@@ -482,13 +463,19 @@ export default {
       }
     },
     // 启动流程出错回调
-    startProcessErrorCallback (data) {
+    startProcessErrorCallback(data) {
       console.log(data)
     },
     // 任务处理出错回调
-    taskHandleErrorCallback (data) {}
+    taskHandleErrorCallback(data) { },
+    download(data) {
+      const alink = document.createElement('a')
+      alink.download = '附件' // 文件名,大部分浏览器兼容,IE10及以下不兼容
+      alink.href = data.attachment // 创建 url地址
+      alink.click() // 自动点击
+    },
   },
-  mounted () {
+  mounted() {
     // this.applyData()
   }
 }
@@ -497,38 +484,47 @@ export default {
 ::v-deep .big-BOX {
   background: rgba(244, 245, 248, 0.8);
   padding: 24px;
+
   h3 {
     font-size: 16px;
     color: #212121;
   }
+
   p {
     width: 100%;
     display: flex;
     justify-content: space-between;
     color: #212121;
     font-size: 14px;
+
     span {
       display: inline-block;
       margin-left: 8px;
       line-height: 32px;
+
       span {
         font-weight: bold;
       }
     }
+
     .text {
       width: 500px;
     }
   }
+
   .lastP {
     margin-top: 16px;
     width: 100%;
+
     span {
       display: flex;
+
       span {
         padding: 0 12px;
         height: 32px;
         background: rgba(232, 234, 239, 1);
         border-radius: 2px;
+
         button {
           background: unset;
           border: 0;
@@ -539,6 +535,7 @@ export default {
     }
   }
 }
+
 ::v-deep .AbilityApply {
   margin-top: 32px;
 
@@ -548,27 +545,33 @@ export default {
     border-bottom: 1px solid #dddee1;
     padding-bottom: 10px;
   }
+
   ul {
     padding-left: 0px;
+
     li {
       list-style: none;
       padding: 30px 0;
       border-bottom: 1px solid #dddee1;
       display: flex;
+
       img {
         width: 100px;
         height: 100px;
       }
+
       div {
         margin-left: 16px;
         display: flex;
         flex-direction: column;
         justify-content: center;
+
         h2 {
           margin-bottom: 20px;
           font-size: 20px;
           color: #000;
           display: flex;
+
           span {
             display: block;
             font-size: 14px;
@@ -581,22 +584,26 @@ export default {
             border-radius: 4px;
           }
         }
+
         p {
           margin-bottom: 0;
         }
       }
     }
+
     .clearfix:after {
       display: block;
       content: "";
       clear: both;
     }
+
     .title {
       color: #0558e1;
       font-size: 18px;
       padding-bottom: 0;
       border-bottom: 0;
     }
+
     .title:before {
       content: "";
       width: 6px;
@@ -610,17 +617,21 @@ export default {
     }
   }
 }
-::v-deep .agreeOr > div {
+
+::v-deep .agreeOr>div {
   display: flex;
   align-items: center;
+
   .el-input {
     margin-right: 10px;
     margin-left: 32px;
   }
 }
-::v-deep .agreeOr > div:last-of-type {
+
+::v-deep .agreeOr>div:last-of-type {
   margin-top: 15px;
 }
+
 .blueAll {
   ::v-deep .el-radio-button__inner {
     width: 80px;
@@ -632,12 +643,14 @@ export default {
     color: #0558e1;
     border: 1px solid #0558e1;
   }
-  ::v-deep .el-radio-button__orig-radio:checked + .el-radio-button__inner {
+
+  ::v-deep .el-radio-button__orig-radio:checked+.el-radio-button__inner {
     box-shadow: unset !important;
     background: #0558e1;
     color: #ffffff;
   }
 }
+
 .inputBule {
   width: 55px;
   height: 32px;
@@ -648,8 +661,10 @@ export default {
   color: #ffffff;
   border: 1px solid #0558e1;
 }
+
 .redAll {
   margin-left: 10px;
+
   ::v-deep .el-radio-button__inner {
     width: 80px;
     height: 32px;
@@ -661,12 +676,14 @@ export default {
     color: #e83a48;
     margin-left: 10px;
   }
-  ::v-deep .el-radio-button__orig-radio:checked + .el-radio-button__inner {
+
+  ::v-deep .el-radio-button__orig-radio:checked+.el-radio-button__inner {
     box-shadow: unset !important;
     color: #ffffff;
     background: #e83a48;
   }
 }
+
 .blueInput {
   width: 55px;
 }
diff --git a/back/src/views/modules/sys/menu-add-or-update.vue b/back/src/views/modules/sys/menu-add-or-update.vue
index ed7ddd49..318254cb 100644
--- a/back/src/views/modules/sys/menu-add-or-update.vue
+++ b/back/src/views/modules/sys/menu-add-or-update.vue
@@ -123,11 +123,12 @@ export default {
     },
     // 获取菜单列表
     getMenuList () {
+      console.log('获取菜单位置2')
       return this.$http.get('/sys/menu/list?type=0').then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
-        this.menuList = res.data
+        this.menuList = res.data.filter(item => item.site === 0)
       }).catch(() => {})
     },
     // 获取信息
diff --git a/back/src/views/modules/sys/menu.vue b/back/src/views/modules/sys/menu.vue
index 4fe46da1..bbc70ae3 100644
--- a/back/src/views/modules/sys/menu.vue
+++ b/back/src/views/modules/sys/menu.vue
@@ -1,3 +1,10 @@
+<!--
+ * @Author: hisense.wuhongjian
+ * @Date: 2022-06-14 09:30:23
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-10-17 14:54:26
+ * @Description: 告诉大家这是什么
+-->
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__menu">
diff --git a/front/public/static/download/感知资源申请表.doc b/front/public/static/download/感知资源申请表.doc
new file mode 100644
index 00000000..903585bf
Binary files /dev/null and b/front/public/static/download/感知资源申请表.doc differ
diff --git a/front/src/store/modules/user.js b/front/src/store/modules/user.js
index 949868d6..08e03603 100644
--- a/front/src/store/modules/user.js
+++ b/front/src/store/modules/user.js
@@ -15,6 +15,7 @@ const state = () => ({
   accessToken: getAccessToken(),
   username: '',
   realName: '',
+  deptName: '',
   userId: '',
   avatar: '',
   role: 0, // 用户管理员权限
@@ -26,6 +27,7 @@ const getters = {
   avatar: (state) => state.avatar,
   role: (state) => state.role,
   userId: (state) => state.userId,
+  deptName: (state) => state.deptName,
 }
 const mutations = {
   /**
@@ -64,6 +66,10 @@ const mutations = {
   setUserId(state, id) {
     state.userId = id
   },
+  // 设置用户单位
+  setDeptName(state, name) {
+    state.deptName = name
+  },
   /**
    * @author chuzhixin 1204505056@qq.com
    * @description 设置头像
@@ -136,6 +142,7 @@ const actions = {
     commit('setRealname', res.data.data.realName)
     commit('setRole', res.data.data.roleIdList.length)
     commit('setUserId', res.data.data.id)
+    commit('setDeptName', res.data.data.deptName)
     // TODO 获取用户信息，后续执行部分操作
     // let { username, avatar, roles, ability } = data
     // if (username && roles && Array.isArray(roles)) {
diff --git a/front/src/vab/plugins/permissions.js b/front/src/vab/plugins/permissions.js
index 4c197d7c..1bda7a3c 100644
--- a/front/src/vab/plugins/permissions.js
+++ b/front/src/vab/plugins/permissions.js
@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-01 17:23:11
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-11 13:59:18
+ * @LastEditors: Light
+ * @LastEditTime: 2022-10-17 09:25:32
  * @Description: 告诉大家这是什么
  */
 /**
@@ -26,7 +26,6 @@ router.beforeEach(async (to, from, next) => {
   // if (SSOTOKEN) {
   //   setAccessToken(SSOTOKEN)
   // }
-  console.log('验证白名单', routesWhiteList)
   const token = getAccessToken()
   console.log('token', token)
   let hasToken = token
@@ -44,6 +43,7 @@ router.beforeEach(async (to, from, next) => {
     accessRoutes.forEach((item) => {
       router.addRoute(item)
     })
+    console.log('验证白名单', routesWhiteList)
     if (routesWhiteList.indexOf(to.path) !== -1) {
       debugger
       next()
diff --git a/front/src/views/abilityStatistics/components/ResourceAggregation.vue b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
index e0d3f8d4..ad7f1428 100644
--- a/front/src/views/abilityStatistics/components/ResourceAggregation.vue
+++ b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
@@ -318,7 +318,7 @@
   //来源部门漏斗图
   const funnelPlot = (dataList) => {
     // 排序
-    let arrCopy = ['0-5', '5-10', '10-15', '15-20', '20以上']
+    let arrCopy = ['1-5', '5-10', '10-15', '15-20', '20以上']
     // 真实数据
     dataList.sort((a, b) => {
       return Number(a.value) - Number(b.value)
diff --git a/front/src/views/home/AbilityToApplyFor.vue b/front/src/views/home/AbilityToApplyFor.vue
index 0a6a6153..eedf7caf 100644
--- a/front/src/views/home/AbilityToApplyFor.vue
+++ b/front/src/views/home/AbilityToApplyFor.vue
@@ -2,7 +2,11 @@
   <div class="ability-to-apply-for" :class="{ all: falg }">
     <div class="title">
       <span>申请能力</span>
-      <div class="btnBox" v-show="!falg">
+      <div
+        class="btnBox"
+        v-show="!falg"
+        v-if="dataForm[0].arr.length > 1 || dataForm.length > 1"
+      >
         <svg
           t="1659419933164"
           class="btn"
@@ -97,7 +101,10 @@
               {{
                 val.description ||
                 ((val.note1 || '') &&
-                  (JSON.parse(val.note1) && JSON.parse(val.note1)[0] && JSON.parse(val.note1)[0].channelName || '--') +
+                  ((JSON.parse(val.note1) &&
+                    JSON.parse(val.note1)[0] &&
+                    JSON.parse(val.note1)[0].channelName) ||
+                    '--') +
                     '等' +
                     JSON.parse(val.note1).length +
                     '个摄像头') ||
@@ -105,7 +112,11 @@
               }}
             </div>
           </div>
-          <div class="remove" v-if="item.arr.length>1" @click="removeFunction(val)"></div>
+          <div
+            class="remove"
+            v-if="item.arr.length > 1"
+            @click="removeFunction(val)"
+          ></div>
         </div>
       </template>
     </div>
@@ -115,11 +126,17 @@
     title="已申请摄像头列表"
     @ok="videoVisible = false"
   >
+  <a-select placeholder="请选择归属部门"  v-model:value="deptName" :getPopupContainer="(triggerNode) => triggerNode.parentNode" show-search  option-filter-prop="children" :filterOption="filterOption" @change="deptIdChangeFunction">
+                    <a-select-option v-for="(item, index) in deptNameAll" :key="`${index}-${item}`" :value="item.name">
+                      {{ item.name }}
+                    </a-select-option>
+    </a-select>
     <a-table
       :columns="columns"
       :data-source="xVideoList"
       bordered
       :pagination="{ defaultPageSize: 6 }"
+      style="margin-top:10px"
     >
       <template #bodyCell="{ column, text }">
         <!-- <template>
@@ -135,6 +152,7 @@
   import { message } from 'ant-design-vue'
   import { ref, defineProps } from 'vue'
   import mybus from '@/myplugins/mybus'
+  import { getDeptAll } from '@/api/user'
   const router = useRouter()
   const props = defineProps({
     dataList: { type: Array, default: null },
@@ -143,12 +161,19 @@
   let dataForm = ref([])
   const videoVisible = ref(false)
   const xVideoList = ref([])
-
+  const xVideoListAll = ref([])
+  const deptNameAll = ref([]) //所有部门名称
+  const deptFlage = ref(true) //判断是否存在默认部门名称
+  const deptName = ref(null)
   const columns = ref([
     {
       title: '摄像头名称',
       dataIndex: 'name',
     },
+     {
+      title: '归属部门',
+      dataIndex: 'managementUnitName',
+    }
   ])
   // eslint-disable-next-line vue/no-setup-props-destructure
   dataForm.value = props.dataList
@@ -178,11 +203,16 @@
   // 详情
   const showItem = (id, type, delFlag, note1) => {
     if (type == '基础设施') {
-      let arr = JSON.parse(note1)
+      let arr = JSON.parse(note1);
       xVideoList.value = []
       arr.map((val) => {
-        xVideoList.value.push({ name: val.channelName || '', key: val.channelId })
+        xVideoList.value.push({
+          name: val.channelName || '',
+          key: val.channelId,
+          managementUnitName:val.managementUnitName || '',
+        })
       })
+      xVideoListAll.value = xVideoList.value;
       videoVisible.value = true
     } else {
       if (delFlag == 0) {
@@ -197,6 +227,27 @@
       }
     }
   }
+    //归属部门选中改变事件
+    const deptIdChangeFunction = (name) => {
+      //console.log('nnnndddd',name);
+      //console.log('过滤前xVideoList',xVideoList);
+      //通过name过滤xVideoList
+        xVideoList.value =  xVideoListAll.value.filter((item) => {
+        if (name && item.managementUnitName.indexOf(name) < 0) return false
+        return true
+      });
+    }
+    //获取所有的归属部门列表
+     const getDeptAllData = () =>{
+      getDeptAll().then((res) => {
+       deptNameAll.value = res.data.data
+        })
+    } 
+      getDeptAllData(); 
+    //select搜索过滤
+    const filterOption = (input, option) => {
+    return option.value.toLowerCase().indexOf(input.toLowerCase()) >= 0
+  }
 </script>
 
 <style scoped lang="less">
@@ -337,4 +388,11 @@
     display: flex;
     align-items: center;
   }
+  ::v-deep .ant-table-thead > tr > th {
+  //padding-left: px;
+  font-size: 18px;
+  font-weight: bold;
+  color:#000000 ;
+  //background: # !important;
+}
 </style>
diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index 0b7b7ebe..1c1b8e18 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -145,7 +145,6 @@
                   ></a-select>
                 </a-form-item>
               </div>
-
               <div>
                 <a-form-item
                   label="需求依据"
@@ -162,20 +161,50 @@
                   />
                 </a-form-item>
               </div>
+
+              <!-- 西海岸--附件上传  -->
+              <div v-if="iskfq && isXiHaiAn">
+                <a-row style="margin-top: 0.4rem">
+                  <a-col :span="24">
+                    <a-form-item
+                      name="attachment"
+                      label="附件上传"
+                      class="introduction"
+                      :rules="[{ required: true, message: '请上传附件' }]"
+                    >
+                      <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>
+                        <span>
+                          支持doc、docx、PDF等格式支撑材料上传，文件大小不超过100M
+                        </span>
+                      </a-upload>
+                    </a-form-item>
+                  </a-col>
+                </a-row>
+                <a-row>
+                  <a-col :span="24" style="margin-left: 106px">
+                    <a
+                      href="/static/download/感知资源申请表.doc"
+                      download="感知资源申请表"
+                    >
+                      感知资源申请表模板下载
+                    </a>
+                  </a-col>
+                </a-row>
+              </div>
+
               <div class="bottom-btn">
                 <a-button
-                  style="
-                    width: 80px;
-                    height: 38px;
-                    margin-right: 20px;
-                    background: #e1edfa;
-                    color: #0087ff;
-                    font-size: 14px;
-                    border-radius: 6px;
-                    border: none;
-                    padding: 0;
-                    text-align: center;
-                  "
+                  class="cancel-apply"
                   type="primary"
                   html-type="cancle"
                   @click="resetFields()"
@@ -183,17 +212,7 @@
                   退出申请
                 </a-button>
                 <a-button
-                  style="
-                    width: 80px;
-                    height: 38px;
-                    background: #0087ff;
-                    color: #fff;
-                    font-size: 14px;
-                    border-radius: 6px;
-                    border: none;
-                    padding: 0;
-                    text-align: center;
-                  "
+                  class="confirm-apply"
                   type="primary"
                   html-type="submit"
                   @click="processStartHandle()"
@@ -241,6 +260,7 @@
   import { pageWithAttrs, updateIntegrationServices } from '@/api/home'
   import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
   import { getIntegrationDetail, soldierApply } from '@/api/home'
+  import { useStore } from 'vuex'
   import * as moment from 'moment'
 
   export default {
@@ -252,6 +272,8 @@
     },
     setup() {
       const router = useRouter()
+      const store = useStore()
+      const deptName = store.getters['user/deptName']
       const disabled = ref(false)
       const flag = ref(false)
       const list = ref(JSON.parse(localStorage.getItem('applyList')))
@@ -279,6 +301,7 @@
           label: '90天',
         },
       ]
+      const apiURL = window.SITE_CONFIG.apiURL
 
       if (!applyAll) {
         list.value.map((item) => {
@@ -307,6 +330,18 @@
       const isXiHaiAn = ref(whoShow.itShowXiHaiAn)
       // 西海岸-判断是否是基础设施-摄像头
       const isCamera = ref(false)
+      // 西海岸-是否是开发区公安分局，是的话，增加上传附件字段
+      let note1 = JSON.parse(
+        (list.value[0] && list.value[0].arr && list.value[0].arr[0].note1) ||
+          '[]'
+      )
+      let iskfq = ref(
+        note1.some(
+          (v) =>
+            v.managementUnitName == '开发区公安局' ||
+            v.managementUnitName == '开发区公安分局'
+        )
+      )
       if (
         list.value[0] &&
         list.value[0].arr &&
@@ -560,6 +595,7 @@
                     handleWrjApply(formName)
                     return
                   }
+
                   submitApply(formName).then((res) => {
                     message.success('申请提交成功，请到消息中心查看！')
                     console.log('能力申请================>', res)
@@ -726,34 +762,6 @@
       ])
       const systemOptions = ref([])
       const systemOptions2 = ref([])
-      const handleChange = (info) => {
-        if (info.file.status !== 'uploading') {
-          // console.log(info.file, info.fileList)
-        }
-        if (info.file.status === 'done') {
-          message.success(`${info.file.name} 上传成功`)
-          formName.enclosure = info.file.response.data
-          formName.enclosureName = info.file.name
-        } else if (info.file.status === 'error') {
-          message.error(`${info.file.name} 上传失败`)
-        }
-      }
-      const beforeUpload = (file) => {
-        const isPNG =
-          file.type === 'image/png' ||
-          'image/doc' ||
-          'image/docx' ||
-          'image/jpg' ||
-          'image/png' ||
-          'image/jpeg' ||
-          'image/pdf' ||
-          'image/xlxs' ||
-          'image/ppt'
-        if (!isPNG) {
-          message.error(`上传失败`)
-        }
-        return isPNG || Upload.LIST_IGNORE
-      }
       const fileList = ref([])
       // 应用系统下拉
       const systemHandleChange = (value) => {
@@ -782,11 +790,14 @@
           if (res.data.data.records.length == 0) {
             message.warning('该关键词，暂无应用资源！')
           } else {
+            // 过滤本单位的应用系统
             res.data.data.records.map((val) => {
-              systemOptions2.value.push({
-                value: val.name,
-                label: val.name,
-              })
+              if (val.deptName === deptName) {
+                systemOptions2.value.push({
+                  value: val.name,
+                  label: val.name,
+                })
+              }
             })
             // console.log('第一次获取===================>', systemOptions2.value)
           }
@@ -868,9 +879,22 @@
         }
         soldierApply(_data)
           .then((res) => {
-            if (res.data.code == 0) {
-              message.success(res.data.msg)
-              jumpToDetailsPageconetent()
+            if (res.data.msg === 'success') {
+              message.success('申请提交成功，请到消息中心查看！')
+              setTimeout(() => {
+                router.push({
+                  path: '/DetailsPageconetent',
+                  query: {
+                    select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
+                    // 基础设施类型
+                    facilitiesType:
+                      list.value[0] &&
+                      list.value[0].arr &&
+                      list.value[0].arr[0] &&
+                      list.value[0].arr[0].type,
+                  },
+                })
+              }, 1000)
             } else {
               message.error('申请失败！')
             }
@@ -880,6 +904,14 @@
           })
       }
 
+      //文件上传成功回调
+      const roomUpload = (response) => {
+        if (response.file.response !== undefined) {
+          fileList.value = response.fileList
+          formName.attachment = response.file.response.data
+        }
+      }
+
       return {
         deptIdChangeFunction,
         formRef,
@@ -897,11 +929,11 @@
         headers: {
           authorization: 'authorization-text',
         },
-        handleChange,
+        // handleChange,
         applySuccess,
         disabled,
         baseURL,
-        beforeUpload,
+        // beforeUpload,
         dataList,
         systemHandleChange,
         systemHandleSearch,
@@ -915,6 +947,9 @@
         isCamera,
         isXiHaiAn,
         expireDateOptions,
+        apiURL,
+        roomUpload,
+        iskfq,
       }
     },
   }
@@ -1021,4 +1056,29 @@
     justify-content: center;
     // position: fixed;
   }
+
+  .cancel-apply {
+    width: 80px;
+    height: 38px;
+    margin-right: 20px;
+    background: #e1edfa;
+    color: #0087ff;
+    font-size: 14px;
+    border-radius: 6px;
+    border: none;
+    padding: 0;
+    text-align: center;
+  }
+
+  .confirm-apply {
+    width: 80px;
+    height: 38px;
+    background: #0087ff;
+    color: #fff;
+    font-size: 14px;
+    border-radius: 6px;
+    border: none;
+    padding: 0;
+    text-align: center;
+  }
 </style>
diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index c9495bdb..0e35d30e 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -1,11 +1,8 @@
 <template>
-  <div
-    class="home-header"
-    :class="[
-      select !== 'home' || scrollTop > 500 ? 'white' : '',
-      props.showView === 'algorithm-details' ? '' : '',
-    ]"
-  >
+  <div class="home-header" :class="[
+    select !== 'home' || scrollTop > 500 ? 'white' : '',
+    props.showView === 'algorithm-details' ? '' : '',
+  ]">
     <div class="name" @click="goToHome">
       <div class="name-bg" v-if="!itShowXiHaiAn"></div>
       <div class="name-bg-xihaian" v-else></div>
@@ -14,52 +11,26 @@
         <p>(United Capacity System)</p>
       </div>
     </div>
-    <div
-      v-for="item in navList"
-      :key="item.key"
-      @click="jumpPage(item)"
-      class="nav"
-      :class="item.key == select ? 'select' : ''"
-    >
+    <div v-for="item in navList" :key="item.key" @click="jumpPage(item)" class="nav"
+      :class="item.key == select ? 'select' : ''">
       {{ item.name }}
     </div>
     <!-- 购物车 -->
     <a-badge :count="sgcNum">
-      <svg
-        t="1650455446850"
-        class="icon"
-        viewBox="0 0 1024 1024"
-        version="1.1"
-        xmlns="http://www.w3.org/2000/svg"
-        p-id="2069"
-        width="0.4rem"
-        height="0.4rem"
-        @click="goToSgc"
-      >
+      <svg t="1650455446850" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
+        p-id="2069" width="0.4rem" height="0.4rem" @click="goToSgc">
         <path
           d="M384 832v85.333333h-85.333333v-85.333333h85.333333z m405.333333 0v85.333333h-85.333333v-85.333333h85.333333zM240.32 185.002667l24.149333 140.928h633.173334L835.285333 746.666667h-563.626666l-85.333334-497.685334H94.485333v-64h145.834667z m583.104 204.928H275.434667L325.632 682.666667h454.464l43.328-292.736z"
-          :fill="props.showView === 'algorithm-details' ? '#1296db' : '#1296db'"
-          p-id="2070"
-        ></path>
+          :fill="props.showView === 'algorithm-details' ? '#1296db' : '#1296db'" p-id="2070"></path>
       </svg>
     </a-badge>
     <a-badge :count="mynoticeNum" style="margin-left: 0.2rem">
       <!-- 消息提醒 -->
-      <svg
-        t="1654051054113"
-        class="icon2"
-        viewBox="0 0 1024 1024"
-        version="1.1"
-        xmlns="http://www.w3.org/2000/svg"
-        p-id="2187"
-        width="0.35rem"
-        height="0.35rem"
-      >
+      <svg t="1654051054113" class="icon2" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
+        p-id="2187" width="0.35rem" height="0.35rem">
         <path
           d="M544 161.536a330.666667 330.666667 0 0 1 298.666667 329.130667h-0.341334c0.213333 1.493333 0.341333 2.986667 0.341334 4.565333v219.434667h39.68a32 32 0 0 1 0 64h-212.053334a160 160 0 0 1-316.586666 0H141.909333a32 32 0 1 1 0-64h39.424v-219.434667c0-1.578667 0.128-3.072 0.341334-4.565333H181.333333a330.666667 330.666667 0 0 1 298.666667-329.130667V128a32 32 0 1 1 64 0v33.536z m-298.666667 553.130667h533.333334v-219.434667c0-1.578667 0.128-3.072 0.341333-4.565333h-0.341333a266.666667 266.666667 0 1 0-533.333334 0h-0.341333c0.213333 1.493333 0.341333 2.986667 0.341333 4.565333v219.434667z m359.765334 64H418.901333a96 96 0 0 0 186.197334 0z"
-          :fill="props.showView === 'algorithm-details' ? '#1296db' : '#1296db'"
-          p-id="2188"
-        ></path>
+          :fill="props.showView === 'algorithm-details' ? '#1296db' : '#1296db'" p-id="2188"></path>
       </svg>
       <!-- <a-avatar shape="square" size="large" /> -->
     </a-badge>
@@ -88,10 +59,7 @@
         <template #title>
           <span>{{ user.realName }}</span>
         </template>
-        <span
-          class="name"
-          @click="jumpPage({ name: '个人中心', key: 'personalCenter' })"
-        >
+        <span class="name" @click="jumpPage({ name: '个人中心', key: 'personalCenter' })">
           {{ user.realName }}
         </span>
       </a-tooltip>
@@ -114,171 +82,234 @@
           fill="#bfbfbf"
         ></path>
       </svg> -->
-      <i
-        @click="jumpPage({ name: '后台管理', key: 'houtaiguanli' })"
-        class="iconTo"
-        v-show="backFlag"
-      ></i>
+      <i @click="jumpPage({ name: '后台管理', key: 'houtaiguanli' })" class="iconTo" v-show="backFlag"></i>
     </div>
   </div>
 </template>
 <script setup>
-  import { ref, onMounted, onBeforeUnmount, defineProps } from 'vue'
-  import { getUserInfo } from '@/api/user'
-  import { recordRoute } from '@/config'
-  import { useRoute, useRouter } from 'vue-router'
-  import { mynotice } from '@/api/home'
-  import { useStore } from 'vuex'
-  import { getSgcTotal } from '@/api/home'
-  import Cookies from 'js-cookie'
-  import mybus from '@/myplugins/mybus'
-  import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
-  import { message } from 'ant-design-vue'
+import { ref, onMounted, onBeforeUnmount, defineProps } from 'vue'
+import { getUserInfo } from '@/api/user'
+import { recordRoute } from '@/config'
+import { useRoute, useRouter } from 'vue-router'
+import { mynotice } from '@/api/home'
+import { useStore } from 'vuex'
+import { getSgcTotal } from '@/api/home'
+import Cookies from 'js-cookie'
+import mybus from '@/myplugins/mybus'
+import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
+import { message } from 'ant-design-vue'
 
-  const store = useStore()
-  const router = useRouter()
-  const route = useRoute()
-  const itShowXiHaiAn = ref(whoShow.itShowXiHaiAn)
+const store = useStore()
+const router = useRouter()
+const route = useRoute()
+const itShowXiHaiAn = ref(whoShow.itShowXiHaiAn)
 
-  // 用户信息
-  const user = ref({
-    username: store.getters['user/username'],
-    realName: store.getters['user/realName'],
-  })
-  const select = ref(router.currentRoute.value.name)
-  const mynoticeFlag = ref(false)
-  const mynoticeData = ref([])
-  const navList = ref(navListManagement.navList)
-  const backFlag = ref(true)
-  getUserInfo().then((res) => {
-    if (
-      res.data.data.roleIdList.length == 0 &&
-      res.data.data.superAdmin === 0
-    ) {
-      backFlag.value = false
-    }
-  })
-  console.log('navList------------>', navList)
+// 用户信息
+const user = ref({
+  username: store.getters['user/username'],
+  realName: store.getters['user/realName'],
+})
+const select = ref(router.currentRoute.value.name)
+const mynoticeFlag = ref(false)
+const mynoticeData = ref([])
+const navList = ref(navListManagement.navList)
+const backFlag = ref(true)
+getUserInfo().then((res) => {
+  if (
+    res.data.data.roleIdList.length == 0 &&
+    res.data.data.superAdmin === 0
+  ) {
+    backFlag.value = false
+  }
+})
+console.log('navList------------>', navList)
 
-  const props = defineProps({
-    showView: { type: String, default: '' },
-  })
+const props = defineProps({
+  showView: { type: String, default: '' },
+})
 
-  // 退出登录
-  const logout = async () => {
-    await store.dispatch('user/logout')
-    window.sessionStorage.setItem('visits', JSON.stringify([]))
-    // 西海岸不返回登录页
-    if (!itShowXiHaiAn.value) {
-      if (recordRoute) {
-        const fullPath = route.fullPath
-        router.push(`/login?redirect=${fullPath}`)
-      } else {
-        router.push('/login')
-      }
+// 退出登录
+const logout = async () => {
+  await store.dispatch('user/logout')
+  window.sessionStorage.setItem('visits', JSON.stringify([]))
+  // 西海岸不返回登录页
+  if (!itShowXiHaiAn.value) {
+    if (recordRoute) {
+      const fullPath = route.fullPath
+      router.push(`/login?redirect=${fullPath}`)
+    } else {
+      router.push('/login')
     }
   }
-  // 返回首页
-  const goToHome = () => {
-    router.push({
-      path: '/home',
+}
+// 返回首页
+const goToHome = () => {
+  // 西海岸
+  if (itShowXiHaiAn.value) {
+    if (
+      !xhaHasPermissionUser.list.includes(user.value.username)
+    ) {
+      return message.warn('暂无权限')
+    }
+  }
+  router.push({
+    path: '/home',
+  })
+}
+// 跳转页面
+const jumpPage = (item) => {
+  // 西海岸
+  if (itShowXiHaiAn.value) {
+    let _arr = ['共享门户', '能力云图', '能力统计', '需求中心', '赋能案例']
+    if (
+      _arr.includes(item.name) &&
+      !xhaHasPermissionUser.list.includes(user.value.username)
+    ) {
+      return message.warn('暂无权限')
+    }
+  }
+  select.value = item.key
+  switch (item.name) {
+    case '个人中心':
+      window.sessionStorage.setItem('type', JSON.stringify('PurchaseVehicle'))
+      router.push({
+        path: '/personalCenter',
+      })
+      break
+    case '能力统计':
+      router.push({
+        path: '/abilityStatistics',
+      })
+      break
+    case '能力集市':
+      router.push({
+        path: '/DetailsPageconetent',
+        query: {
+          select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
+        },
+      })
+      break
+    case '能力云图':
+      router.push({
+        path: '/capabilityCloud',
+      })
+      break
+    // case '技术文档':
+    //   router.push({
+    //     path: '/developmentGuide',
+    //   })
+    //   break
+    case '新手指南':
+      router.push({
+        path: '/instructionManual',
+      })
+      break
+    case '需求中心':
+      router.push({
+        path: '/demandCenter',
+      })
+      break
+    case '区市站点':
+      router.push({
+        path: '/mapTest',
+      })
+      break
+    case '后台管理':
+      Cookies.remove('JSESSIONID')
+      window.open(window.SITE_CONFIG.backUrl + '/#/workBench-workBench')
+      // window.reload('http://15.2.21.238:9797')
+      break
+    case '赋能案例':
+      router.push({
+        path: '/assignCase',
+      })
+      break
+    case '典型赋能案例':
+      router.push({
+        path: '/assignCase',
+      })
+      break
+    case '融合服务':
+      router.push({
+        path: '/integrationServices',
+      })
+      break
+    case 'CIM专区':
+      router.push({
+        path: '/cimSpecialArea',
+      })
+      break
+    default:
+      router.push('/home')
+      break
+  }
+}
+const scrollTop = ref(0)
+window.onscroll = function () {
+  //为了保证兼容性，这里取两个值，哪个有值取哪一个
+  //scrollTop就是触发滚轮事件时滚轮的高度
+  scrollTop.value =
+    document.documentElement.scrollTop || document.body.scrollTop
+  // console.log('滚动距离' + scrollTop.value)
+}
+mybus.on('getSgcNum', () => {
+  getSgcTotal().then((res) => {
+    sgcNum.value = res.data.data.count
+    // console.log('申购车总数========================>', res.data.data.count)
+  })
+})
+
+const sgcNum = ref(0)
+const goToSgc = () => {
+  window.sessionStorage.setItem('type', JSON.stringify('PurchaseVehicle'))
+  router.push('/personalCenter')
+}
+const mynoticeNum = ref(0)
+// 我的消息
+const getMynotice = () => {
+  mynotice({ page: 1, limit: 3, readStatus: 0 }).then((res) => {
+    // console.log('我的消息', res.data.data)
+    mynoticeNum.value = res.data.data.total
+    mynoticeData.value = res.data.data.list
+  })
+}
+const goToView = () => {
+  router.push({
+    path: '/mynoticeView',
+  })
+}
+// const read = (item) => {
+//   mynoticeRead(item.id).then((res) => {
+//     console.log('已读', res)
+//     getMynotice()
+//   })
+// }
+// 建立链接 -- 携带cookie参数
+
+onMounted(() => {
+  getSgcTotal().then((res) => {
+    // console.log('初始化========================>', res.data.data.count)
+    sgcNum.value = res.data.data.count
+  })
+  getMynotice()
+  // 解决
+  const mynoticeDom = document.querySelector('.icon2')
+  const mynotice = document.querySelector('.mynotice')
+  if (mynoticeDom) {
+    mynoticeDom.addEventListener('mouseover', () => {
+      mynoticeFlag.value = true
+    })
+    mynoticeDom.addEventListener('mouseout', () => {
+      mynoticeFlag.value = false
     })
   }
-  // 跳转页面
-  const jumpPage = (item) => {
-    // 西海岸
-    if (itShowXiHaiAn.value) {
-      let _arr = ['共享门户', '能力云图', '能力统计', '需求中心', '赋能案例']
-      if (
-        _arr.includes(item.name) &&
-        !xhaHasPermissionUser.list.includes(user.value.username)
-      ) {
-        return message.warn('暂无权限')
-      }
-    }
-    select.value = item.key
-    switch (item.name) {
-      case '个人中心':
-        window.sessionStorage.setItem('type', JSON.stringify('PurchaseVehicle'))
-        router.push({
-          path: '/personalCenter',
-        })
-        break
-      case '能力统计':
-        router.push({
-          path: '/abilityStatistics',
-        })
-        break
-      case '能力集市':
-        router.push({
-          path: '/DetailsPageconetent',
-          query: {
-            select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
-          },
-        })
-        break
-      case '能力云图':
-        router.push({
-          path: '/capabilityCloud',
-        })
-        break
-      // case '技术文档':
-      //   router.push({
-      //     path: '/developmentGuide',
-      //   })
-      //   break
-      case '新手指南':
-        router.push({
-          path: '/instructionManual',
-        })
-        break
-      case '需求中心':
-        router.push({
-          path: '/demandCenter',
-        })
-        break
-      case '区市站点':
-        router.push({
-          path: '/mapTest',
-        })
-        break
-      case '后台管理':
-        Cookies.remove('JSESSIONID')
-        window.open(window.SITE_CONFIG.backUrl + '/#/workBench-workBench')
-        // window.reload('http://15.2.21.238:9797')
-        break
-      case '赋能案例':
-        router.push({
-          path: '/assignCase',
-        })
-        break
-      case '典型赋能案例':
-        router.push({
-          path: '/assignCase',
-        })
-        break
-      case '融合服务':
-        router.push({
-          path: '/integrationServices',
-        })
-        break
-      case 'CIM专区':
-        router.push({
-          path: '/cimSpecialArea',
-        })
-        break
-      default:
-        router.push('/home')
-        break
-    }
-  }
-  const scrollTop = ref(0)
-  window.onscroll = function () {
-    //为了保证兼容性，这里取两个值，哪个有值取哪一个
-    //scrollTop就是触发滚轮事件时滚轮的高度
-    scrollTop.value =
-      document.documentElement.scrollTop || document.body.scrollTop
-    // console.log('滚动距离' + scrollTop.value)
+  if (mynotice) {
+    mynotice.addEventListener('mouseover', () => {
+      mynoticeFlag.value = true
+    })
+    mynotice.addEventListener('mouseout', () => {
+      mynoticeFlag.value = false
+    })
   }
   mybus.on('getSgcNum', () => {
     getSgcTotal().then((res) => {
@@ -286,329 +317,268 @@
       // console.log('申购车总数========================>', res.data.data.count)
     })
   })
-
-  const sgcNum = ref(0)
-  const goToSgc = () => {
-    window.sessionStorage.setItem('type', JSON.stringify('PurchaseVehicle'))
-    router.push('/personalCenter')
-  }
-  const mynoticeNum = ref(0)
-  // 我的消息
-  const getMynotice = () => {
-    mynotice({ page: 1, limit: 3, readStatus: 0 }).then((res) => {
-      // console.log('我的消息', res.data.data)
-      mynoticeNum.value = res.data.data.total
-      mynoticeData.value = res.data.data.list
-    })
-  }
-  const goToView = () => {
-    router.push({
-      path: '/mynoticeView',
-    })
-  }
-  // const read = (item) => {
-  //   mynoticeRead(item.id).then((res) => {
-  //     console.log('已读', res)
-  //     getMynotice()
-  //   })
-  // }
-  // 建立链接 -- 携带cookie参数
-
-  onMounted(() => {
-    getSgcTotal().then((res) => {
-      // console.log('初始化========================>', res.data.data.count)
-      sgcNum.value = res.data.data.count
-    })
+  mybus.on('getMynotice', () => {
     getMynotice()
-    // 解决
-    const mynoticeDom = document.querySelector('.icon2')
-    const mynotice = document.querySelector('.mynotice')
-    if (mynoticeDom) {
-      mynoticeDom.addEventListener('mouseover', () => {
-        mynoticeFlag.value = true
-      })
-      mynoticeDom.addEventListener('mouseout', () => {
-        mynoticeFlag.value = false
-      })
-    }
-    if (mynotice) {
-      mynotice.addEventListener('mouseover', () => {
-        mynoticeFlag.value = true
-      })
-      mynotice.addEventListener('mouseout', () => {
-        mynoticeFlag.value = false
-      })
-    }
-    mybus.on('getSgcNum', () => {
-      getSgcTotal().then((res) => {
-        sgcNum.value = res.data.data.count
-        // console.log('申购车总数========================>', res.data.data.count)
-      })
-    })
-    mybus.on('getMynotice', () => {
-      getMynotice()
-    })
-  })
-  onBeforeUnmount(() => {
-    mybus.off('getSgcNum')
-    mybus.off('getMynotice')
   })
+})
+onBeforeUnmount(() => {
+  mybus.off('getSgcNum')
+  mybus.off('getMynotice')
+})
 </script>
 <style lang="less" scoped>
-  @font-face {
-    font-family: 'header-typeface';
-    src: url('~@/assets/newHome/font/header-typeface.ttf');
+@font-face {
+  font-family: 'header-typeface';
+  src: url('~@/assets/newHome/font/header-typeface.ttf');
+}
+
+.home-header {
+  height: 0.64rem;
+  width: 100%;
+  max-width: 1920px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  // padding: 0 1rem;
+  background-color: rgba(0, 0, 25, 0.7);
+  position: fixed;
+  z-index: 1000;
+  top: 0;
+
+  div {
+    color: #fff;
+    font-size: 0.16rem;
   }
 
-  .home-header {
+  .name {
+    cursor: pointer;
+    font-size: 0.22rem;
+    font-family: header-typeface;
+    margin-right: 0.2rem;
+    display: flex;
+    align-items: center;
+
+    .name-bg {
+      height: 0.6rem;
+      width: 0.6rem;
+      background: url('~@/assets/newHome/ucs-2.png') no-repeat;
+      background-size: 100%;
+      margin-right: 0.15rem;
+    }
+
+    .name-bg-xihaian {
+      height: 0.6rem;
+      width: 0.6rem;
+      background: url('~@/assets/newHome/newHome-title-bg-xihaian.png') no-repeat;
+      background-size: 100%;
+      margin-right: 0.15rem;
+    }
+
+    .name-content {
+      padding-top: 0.14rem;
+
+      p {
+        font-size: 0.2rem;
+        margin-bottom: 0;
+
+        &:nth-of-type(2) {
+          font-size: 0.12rem;
+        }
+      }
+    }
+  }
+
+  .nav {
+    width: 1.2rem;
     height: 0.64rem;
-    width: 100%;
-    max-width: 1920px;
+    line-height: 0.64rem;
+    text-align: center;
+  }
+
+  .nav:hover {
+    background: #0058e1;
+    color: #fff;
+    cursor: pointer;
+  }
+
+  .select {
+    background: #0058e1;
+    color: #fff !important;
+  }
+
+  .info {
+    // width: 2rem;
+    margin-left: 0.2rem;
     display: flex;
     justify-content: center;
-    align-items: center;
-    // padding: 0 1rem;
-    background-color: rgba(0, 0, 25, 0.7);
-    position: fixed;
-    z-index: 1000;
-    top: 0;
 
-    div {
-      color: #fff;
+    .img {
+      width: 0.3rem;
+      height: 0.3rem;
+      border-radius: 0.1rem;
+      background: url('~@/assets/newHome/user.png') no-repeat;
+      background-size: 100%;
+    }
+
+    span {
+      height: 0.3rem;
+      line-height: 0.3rem;
+      margin-left: 0.08rem;
+      margin-right: 0.06rem;
       font-size: 0.16rem;
     }
 
     .name {
+      max-width: 2.3rem;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-line-clamp: 1;
+      -webkit-box-orient: vertical;
+      overflow: hidden;
+      word-break: break-all;
+    }
+
+    .out {
       cursor: pointer;
-      font-size: 0.22rem;
-      font-family: header-typeface;
-      margin-right: 0.2rem;
-      display: flex;
-      align-items: center;
-
-      .name-bg {
-        height: 0.6rem;
-        width: 0.6rem;
-        background: url('~@/assets/newHome/ucs-2.png') no-repeat;
-        background-size: 100%;
-        margin-right: 0.15rem;
-      }
-
-      .name-bg-xihaian {
-        height: 0.6rem;
-        width: 0.6rem;
-        background: url('~@/assets/newHome/newHome-title-bg-xihaian.png')
-          no-repeat;
-        background-size: 100%;
-        margin-right: 0.15rem;
-      }
-
-      .name-content {
-        padding-top: 0.14rem;
-
-        p {
-          font-size: 0.2rem;
-          margin-bottom: 0;
-
-          &:nth-of-type(2) {
-            font-size: 0.12rem;
-          }
-        }
-      }
-    }
-
-    .nav {
-      width: 1.2rem;
-      height: 0.64rem;
-      line-height: 0.64rem;
-      text-align: center;
-    }
-
-    .nav:hover {
-      background: #0058e1;
-      color: #fff;
-      cursor: pointer;
-    }
-
-    .select {
-      background: #0058e1;
-      color: #fff !important;
-    }
-
-    .info {
-      // width: 2rem;
-      margin-left: 0.2rem;
-      display: flex;
-      justify-content: center;
-
-      .img {
-        width: 0.3rem;
-        height: 0.3rem;
-        border-radius: 0.1rem;
-        background: url('~@/assets/newHome/user.png') no-repeat;
-        background-size: 100%;
-      }
-
-      span {
-        height: 0.3rem;
-        line-height: 0.3rem;
-        margin-left: 0.08rem;
-        margin-right: 0.06rem;
-        font-size: 0.16rem;
-      }
-
-      .name {
-        max-width: 2.3rem;
-        text-overflow: ellipsis;
-        display: -webkit-box;
-        -webkit-line-clamp: 1;
-        -webkit-box-orient: vertical;
-        overflow: hidden;
-        word-break: break-all;
-      }
-
-      .out {
-        cursor: pointer;
-        // padding: 0 0.16rem;
-        padding: 0 0.04rem 0 0.1rem;
-        border-left: 0.01rem solid #666;
-      }
-
-      .icon {
-        cursor: pointer;
-      }
-    }
-  }
-
-  .white {
-    background-color: #fff;
-    box-shadow: 0 0.02rem 0.1rem rgba(0, 0, 0, 0.1);
-
-    .name {
-      color: #0058e1;
-
-      .name-bg {
-        height: 0.6rem;
-        width: 0.6rem;
-        background: url('~@/assets/newHome/ucs-1.png') no-repeat;
-        background-size: 100%;
-        margin-right: 0.15rem;
-      }
-
-      p {
-        color: #0058e1;
-      }
+      // padding: 0 0.16rem;
+      padding: 0 0.04rem 0 0.1rem;
+      border-left: 0.01rem solid #666;
     }
 
     .icon {
       cursor: pointer;
     }
-
-    .nav {
-      color: #000;
-    }
-
-    .info {
-      span {
-        color: #000;
-      }
-    }
   }
+}
 
-  .blue {
-    position: absolute;
-    background: linear-gradient(
-      to right,
-      rgba(15, 90, 253, 0.8),
-      rgba(36, 25, 248, 0.8)
-    );
+.white {
+  background-color: #fff;
+  box-shadow: 0 0.02rem 0.1rem rgba(0, 0, 0, 0.1);
 
-    .name {
-      color: #fff;
+  .name {
+    color: #0058e1;
+
+    .name-bg {
+      height: 0.6rem;
+      width: 0.6rem;
+      background: url('~@/assets/newHome/ucs-1.png') no-repeat;
+      background-size: 100%;
+      margin-right: 0.15rem;
     }
 
-    .nav {
-      color: #fff;
-    }
-
-    .nav:hover {
-      background: #fff;
+    p {
       color: #0058e1;
     }
-
-    .info {
-      span {
-        color: #fff;
-      }
-    }
   }
 
-  .mynotice {
-    width: 4rem;
-    height: 3rem;
-    background: #eee;
-    border-radius: 0.05rem;
-    position: absolute;
-    top: 0.45rem;
-    right: 2.4rem;
-    overflow-y: scroll;
-
-    .bottom {
-      cursor: pointer;
-      width: 100%;
-      text-align: center;
-      color: #000;
-      font-size: 0.16rem;
-    }
-  }
-
-  .mynotice::-webkit-scrollbar {
-    display: none;
-  }
-
-  :deep(.ant-list-item) {
-    border-bottom: 0.01rem solid #ccc;
-    padding: 0.1rem;
-  }
-
-  :deep(.ant-list-item-meta-title) {
-    // display: flex;
-    // justify-content: space-around;
-    // align-items: center;
-    // padding: 0 0.05rem;
-    a {
-      width: 3.8rem;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      display: -webkit-box;
-      -webkit-line-clamp: 2;
-      word-break: break-all;
-      -webkit-box-orient: vertical;
-    }
-
-    button {
-      width: 0.7rem;
-      height: 0.25rem;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-
-      span {
-        font-size: 0.1rem;
-      }
-    }
-  }
-
-  .iconTo {
-    display: block;
-    width: 0.35rem;
-    height: 0.35rem;
-    background: url('~@/assets/newHome/iconTo.png') no-repeat;
+  .icon {
     cursor: pointer;
   }
+
+  .nav {
+    color: #000;
+  }
+
+  .info {
+    span {
+      color: #000;
+    }
+  }
+}
+
+.blue {
+  position: absolute;
+  background: linear-gradient(to right,
+      rgba(15, 90, 253, 0.8),
+      rgba(36, 25, 248, 0.8));
+
+  .name {
+    color: #fff;
+  }
+
+  .nav {
+    color: #fff;
+  }
+
+  .nav:hover {
+    background: #fff;
+    color: #0058e1;
+  }
+
+  .info {
+    span {
+      color: #fff;
+    }
+  }
+}
+
+.mynotice {
+  width: 4rem;
+  height: 3rem;
+  background: #eee;
+  border-radius: 0.05rem;
+  position: absolute;
+  top: 0.45rem;
+  right: 2.4rem;
+  overflow-y: scroll;
+
+  .bottom {
+    cursor: pointer;
+    width: 100%;
+    text-align: center;
+    color: #000;
+    font-size: 0.16rem;
+  }
+}
+
+.mynotice::-webkit-scrollbar {
+  display: none;
+}
+
+:deep(.ant-list-item) {
+  border-bottom: 0.01rem solid #ccc;
+  padding: 0.1rem;
+}
+
+:deep(.ant-list-item-meta-title) {
+
+  // display: flex;
+  // justify-content: space-around;
+  // align-items: center;
+  // padding: 0 0.05rem;
+  a {
+    width: 3.8rem;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    word-break: break-all;
+    -webkit-box-orient: vertical;
+  }
+
+  button {
+    width: 0.7rem;
+    height: 0.25rem;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    span {
+      font-size: 0.1rem;
+    }
+  }
+}
+
+.iconTo {
+  display: block;
+  width: 0.35rem;
+  height: 0.35rem;
+  background: url('~@/assets/newHome/iconTo.png') no-repeat;
+  cursor: pointer;
+}
 </style>
 <style>
-  html::-webkit-scrollbar {
-    display: none;
-  }
+html::-webkit-scrollbar {
+  display: none;
+}
 </style>
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 96cf4576..9a7bc57f 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -5,24 +5,15 @@
     <div class="infrastructrue-tab">
       <div v-for="(item, index) in tabList" :key="index" class="tabBox">
         <b class="leftType">{{ item.title }}</b>
-        <el-button
-          @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>
@@ -30,35 +21,19 @@
 
     <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>
@@ -69,40 +44,23 @@
           <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>
@@ -115,54 +73,39 @@
               {{ 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>
@@ -171,45 +114,27 @@
             </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
+            ? '通过'
+            : lookData.state == 1
+            ? '审核中'
+            : '不通过'
             }}
           </span>
           <span style="width: 8rem; margin-bottom: 0.3rem">
@@ -217,29 +142,24 @@
           </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>
@@ -249,43 +169,18 @@
           使用事项：{{ 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] }}
@@ -293,40 +188,21 @@
               </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>
@@ -336,42 +212,23 @@
               </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>
@@ -382,18 +239,11 @@
               </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="appointmentRoom = false" 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>
@@ -423,47 +273,23 @@
         <!-- 右侧 -->
         <div class="contentRight">
           <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="(e) => getCamera(true, e.target.value)" />
+            <a-button type="primary" style="width: 0.8rem; height: 0.36rem; margin-left: 0.7rem" @click="clean">
               重置
             </a-button>
           </div>
           <i class="boundary"></i>
           <!-- 批量预览 -->
-          <a-button
-            type="primary"
-            @click="batchPreview"
-            class="buttonAdd"
-            v-if="isXiHaiAn"
-          >
+          <a-button type="primary" @click="batchPreview" class="buttonAdd" v-if="isXiHaiAn">
             批量预览
           </a-button>
           <!-- 添加至申购车 -->
-          <a-button
-            v-if="isXiHaiAn"
-            type="primary"
-            @click="addShoppingCart"
-            class="buttonAdd"
-          >
+          <a-button v-if="isXiHaiAn" type="primary" @click="addShoppingCart" class="buttonAdd">
             添加至申购车
           </a-button>
           <!-- 一键申请 -->
-          <a-button
-            v-if="isXiHaiAn"
-            type="primary"
-            @click="apply"
-            class="buttonAdd"
-          >
+          <a-button v-if="isXiHaiAn" type="primary" @click="apply" class="buttonAdd">
             一键申请
           </a-button>
           <a-button v-else type="primary" @click="goToWeb" class="buttonAdd">
@@ -473,39 +299,27 @@
       </div>
       <!-- 表格 -->
       <div class="infrastructrue-table" v-if="!wrjFlag">
-        <a-table
-          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,
             onSelect: onSelectChange,
             onSelectAll: onSelectAll,
-          }"
-          :loading="loadingCamera"
-        >
+          }" :loading="loadingCamera">
           <template #bodyCell="{ column, record }">
             <template v-if="isXiHaiAn && column.dataIndex === 'status'">
               <span>{{ statusText[record.status] || '' }}</span>
             </template>
             <template v-if="column.dataIndex === 'operation'">
-              <a
-                @click="
-                  openVideo(
-                    record.channelCode ||
-                      record.channelId ||
-                      record.channelCode.channelId,
-                    record
-                  )
-                "
-              >
+              <a :class="record.status != 1 ? 'disabled-text' : ''" @click="
+                openVideo(
+                  record.channelCode ||
+                    record.channelId ||
+                    record.channelCode.channelId,
+                  record
+                )
+              ">
                 预览
               </a>
             </template>
@@ -514,25 +328,13 @@
       </div>
       <!-- 西海岸-无人机、单兵设备 -->
       <div class="infrastructrue-table" v-else-if="isXiHaiAn && wrjFlag">
-        <a-table
-          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="pagination" @change="handleTableChange">
           <template #bodyCell="{ column, record }">
             <template v-if="column.dataIndex === 'operation'">
-              <a-button
-                @click="goToApply(record)"
-                type="link"
-                :disabled="record.state != 1"
-              >
+              <a-button @click="goToApply(record)" type="link" :disabled="record.state != 1">
                 申请
               </a-button>
               <a-button @click="showWrj(record)" type="link">详情</a-button>
@@ -541,19 +343,10 @@
         </a-table>
       </div>
       <!-- 单个预览弹窗 -->
-      <a-modal
-        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"
-            v-show="isXiHaiAn"
-          >
+          <div style="width: 100%; height: 100%; position: relative" v-show="isXiHaiAn">
             <!-- 西海岸--预览视频--遮罩 todo-->
             <div class="video-cover" @click="videoShowMsg"></div>
             <div class="waterMark waterMark-left-top">
@@ -574,138 +367,70 @@
       </a-modal>
 
       <!-- 图片预览 -->
-      <a-modal
-        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, index) in videoList"
-            :key="item.id"
-            style="width: 100%; height: 100%; position: relative"
-          >
+          <div v-for="(item, index) in videoList" :key="item.id" style="width: 100%; height: 100%; position: relative">
             <!-- 批量预览视频--遮罩 -->
-            <div
-              class="batch-video-cover"
-              @click="videoShowMsg(index)"
-              v-show="isXiHaiAn"
-            ></div>
-            <div
-              class="batch-waterMark batch-waterMark-left-top"
-              v-show="isXiHaiAn"
-            >
+            <div class="batch-video-cover" @click="videoShowMsg(index)" v-show="isXiHaiAn"></div>
+            <div class="batch-waterMark batch-waterMark-left-top" v-show="isXiHaiAn">
               {{ userInfo.usernameShow }}
             </div>
-            <div
-              class="batch-waterMark batch-waterMark-right-top"
-              v-show="isXiHaiAn"
-            >
+            <div class="batch-waterMark batch-waterMark-right-top" v-show="isXiHaiAn">
               {{ userInfo.realNameShow }}
             </div>
-            <div
-              class="batch-waterMark batch-waterMark-left-bottom"
-              v-show="isXiHaiAn"
-            >
+            <div class="batch-waterMark batch-waterMark-left-bottom" v-show="isXiHaiAn">
               {{ userInfo.usernameShow }}
             </div>
-            <div
-              class="batch-waterMark batch-waterMark-right-bottom"
-              v-show="isXiHaiAn"
-            >
+            <div class="batch-waterMark batch-waterMark-right-bottom" v-show="isXiHaiAn">
               {{ userInfo.realNameShow }}
             </div>
             <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"
-      >
+      <a-modal wrapClassName="wrj" v-model:visible="wrjVisible" :width="1000" :title="wrjName + '详情'"
+        @ok="wrjVisible = false">
         <template #footer></template>
         <div v-for="(db, key) in wrjData" :key="key">
           <template v-if="typeof db == 'object'">
-            <div
-              style="
+            <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"
-              >
+              <div style="padding: 0 30px" v-for="(value, key2) in JSON.parse(db.attrValue)" :key="value">
                 {{ key2 + '：' + value }}
               </div>
             </template>
@@ -716,1189 +441,1145 @@
   </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,
-  } from 'vue'
-  import { getUser, getUserInfo } from '@/api/home'
-  import {
-    getCameraByParentId,
-    getStreamByChannelCode,
-    getCameraAllLabel,
-    selectByChannelCode,
-  } from '@/api/videoSurveillance'
-  import { getCameraByCondition } from '@/api/file'
-  import {
-    sgcInsert,
-    xhaAddCart,
-    getRoomSearch,
-    getDate,
-    setSubmit,
-    getYuyue,
-    getSoldierList,
-    getMaxApplyNum,
-  } 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字内容' }],
-    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({})
+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,
+} from 'vue'
+import { getUser, getUserInfo } from '@/api/home'
+import {
+  getCameraByParentId,
+  getStreamByChannelCode,
+  getCameraAllLabel,
+  selectByChannelCode,
+} from '@/api/videoSurveillance'
+import { getCameraByCondition } from '@/api/file'
+import {
+  sgcInsert,
+  xhaAddCart,
+  getRoomSearch,
+  getDate,
+  setSubmit,
+  getYuyue,
+  getSoldierList,
+  getMaxApplyNum,
+} 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字内容' }],
+  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
-  }
-  // 消息列表页面
-  let formPage = router.currentRoute.value.query.formPage || ''
-  onMounted(() => {
-    // 获取用户信息
-    handleUser()
-
-    if (jcssType.value) {
-      tabClick(0, jcssType.value)
-      if (jcssType.value == '视频资源') {
-        getCamera()
-      }
-    } else {
-      if (isXiHaiAn) {
+// console.log('模糊查传递', props.searchValue)
+if (props.searchValue) {
+  mapSearchParam.value.cameraName = props.searchValue
+}
+// 消息列表页面
+let formPage = router.currentRoute.value.query.formPage || ''
+// 设施类型--无人机和单兵设备
+let facilitiesType = router.currentRoute.value.query.facilitiesType || ''
+onMounted(() => {
+  // 获取用户信息
+  handleUser()
+  if (jcssType.value) {
+    tabClick(0, jcssType.value)
+    if (jcssType.value == '视频资源') {
+      getCamera()
+    }
+  } else {
+    if (isXiHaiAn) {
+      if (facilitiesType) {
+        tabClick(0, facilitiesType)
+      } else {
         let _obj = {
           title: '视频标签',
           content: ['视频资源'],
         }
         clickList.value.push(_obj)
         tabClick(0, '视频资源')
+      }
+    } else {
+      // 默认选中
+      if (formPage && formPage == 'noticePage') {
+        tabClick(0, '城市云脑会客厅')
+        roomYuyue.value = false
+        roomResult.value = true
+        onSearch()
       } else {
-        // 默认选中
-        if (formPage && formPage == 'noticePage') {
-          tabClick(0, '城市云脑会客厅')
-          roomYuyue.value = false
-          roomResult.value = true
-          onSearch()
-        } else {
-          tabClick(0, '政务云资源')
-        }
+        tabClick(0, '政务云资源')
       }
     }
+  }
 
-    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
-      mapSearchParam.value.type = param.type
-      mapSearchParam.value.borderPolygonList = param.borderPolygonList
-      mapSearchParam.value.pageSize = param.type != 0 ? 20000 : 10
-      selectedRowKeys.value = [] //清空选中的点位
-      selectedList.value = []
+  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
+    mapSearchParam.value.type = param.type
+    mapSearchParam.value.borderPolygonList = param.borderPolygonList
+    mapSearchParam.value.pageSize = param.type != 0 ? 20000 : 10
+    selectedRowKeys.value = [] //清空选中的点位
+    selectedList.value = []
 
-      dataSource.value = param.dataSource
-      pagination.value.total = param.total
+    dataSource.value = param.dataSource
+    pagination.value.total = param.total
+  })
+  //点位点击
+  mybus.off('pointMarkerClick')
+  mybus.on('pointMarkerClick', (point) => {
+    console.log('pointMarkerClick->point', selectedList.value, point)
+    let check = false //是否勾选
+    if (selectedList.value && selectedList.value.length > 0) {
+      selectedList.value.forEach((ele) => {
+        if (ele.channelCode == point.data.channelCode) {
+          check = true
+        }
+      })
+    }
+    let pointData = new Proxy(point.data, point)
+    onSelectChange(pointData, !check, '', '', 'proxy')
+  })
+})
+const selectedList = ref([])
+const selectedRowKeys = ref([])
+const tabList = ref([
+  {
+    title: '设施类型',
+    content: isXiHaiAn
+      ? ['视频资源']
+      : ['政务云资源', '视频资源' /**',感知资源' */, '城市云脑会客厅'],
+  },
+])
+let clickList = ref([]) //存储点击的tab
+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 = [
+    {
+      arr: [
+        {
+          description: data.description,
+          resourceId: data.id,
+          resourceName: data.wrjName,
+          type: data.type,
+        },
+      ],
+      deptId: dept.deptId || data.deptId || '',
+      deptName: dept.deptName,
+    },
+  ]
+  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 rowClickData = ref(null)
+// 打开视频预览
+const openVideo = (id, item) => {
+  rowClickData.value = item
+  // 单个预览
+  if (item && item.status != 1) {
+    return
+    // return message.warning('当前设备离线, 不可预览！')
+  }
+  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,
+      content: [],
+    }
+    clickList.value.push(params)
+  })
+  mybus.off('tranferToList')
+  mybus.on('tranferToList', () => {
+    console.log('获取到的列表数据')
+  })
+}
+
+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 = roomEndTime.value.substr(0, 2)
+    for (let i = hour; i < 24; i++) {
+      hours.push(i)
+    }
+    return hours
+  }
+}
+//获取不可选择的分钟
+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()
+      })
     })
-    //点位点击
-    mybus.off('pointMarkerClick')
-    mybus.on('pointMarkerClick', (point) => {
-      console.log('pointMarkerClick->point', selectedList.value, point)
-      let check = false //是否勾选
-      if (selectedList.value && selectedList.value.length > 0) {
-        selectedList.value.forEach((ele) => {
-          if (ele.channelCode == point.data.channelCode) {
-            check = true
+    .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'])
+const selectType = ref('政务云资源')
+//表格的高度
+let tableHeight = ref('600')
+//tab切换点击事件
+const tabClick = (indexFather, name) => {
+  console.log(
+    '点击tab================>',
+    indexFather,
+    name,
+    clickList.value,
+    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 = '视频标签'
+      }
+      selectType.value = '视频资源'
+      console.log('444------------>', 444)
+    } 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 = '政务云资源分类'
+      }
+      selectType.value = '政务云资源'
+    } else if (name == '感知资源') {
+      room.value = true
+      tableHeight.value = 330
+      showMap.value = true
+      dataSource.value = []
+      dataSource2.value = []
+      pagination.value.total = 0
+      selectType.value = '感知资源'
+    } else if (name == '城市云脑会客厅') {
+    }
+    clickList.value[indexFather].content.splice(
+      clickList.value[indexFather].content.indexOf(name),
+      1
+    )
+  } else {
+    if (name == '视频资源') {
+      selectType.value = '视频资源'
+      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)
+        })
       }
-      let pointData = new Proxy(point.data, point)
-      onSelectChange(pointData, !check, '', '', 'proxy')
+      mapSearchParam.value.gpsX = ''
+      mapSearchParam.value.gpsY = ''
+      mapSearchParam.value.radius = ''
+      mapSearchParam.value.type = ''
+      mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + ''
+      emits('add', 1)
+      getCamera()
+    } else if (name == '政务云资源') {
+      selectType.value = '政务云资源'
+      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 == '感知资源') {
+      selectType.value = '感知资源'
+      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
+  console.log(
+    'clickList.value[indexFather].content[0]------------>',
+    clickList.value[indexFather].content[0]
+  )
+
+  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
+      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)
+      })
+    }
+    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)
+      })
+    }
+    batchPicVisible.value = true
+  } else {
+    message.error('请选择需要预览的数据')
+  }
+}
+// 清空
+const nullClick = () => {
+  if (clickList.value[1]) {
+    clickList.value[1].content = []
+  }
+  mapSearchParam.value.labelCodes = ''
+  getCamera()
+}
+// 重置
+const clean = () => {
+  mapSearchParam.value.cameraName = ''
+  selectedList.value = []
+  selectedRowKeys.value = []
+  videoList.value = []
+  pagination.value.current = 1
+  mapSearchParam.value.pageNum = 1
+  mapSearchParam.value.type = 0
+  pagination.value.pageSize = 10
+  getCamera()
+}
+const videoClean = () => {
+  //视频预览弹窗关闭后不清除选中行
+  videoList.value = []
+  current.value = 1
+}
+// 改变批量预览的分页
+const changePage = (page) => { }
+// 一键申请
+const dept = reactive({})
+if (infrastructure) {
+  dept.deptId = infrastructure.deptId || ''
+  dept.deptName = infrastructure.deptName || ''
+}
+
+// 西海岸--判断设备最大数量个数
+const judegNumber = () => {
+  return new Promise((resolve, reject) => {
+    getMaxApplyNum(selectedRowKeys.value.length)
+      .then((res) => {
+        resolve(res)
+      })
+      .catch((err) => {
+        reject(err)
+      })
   })
-  const selectedList = ref([])
-  const selectedRowKeys = ref([])
-  const tabList = ref([
-    {
-      title: '设施类型',
-      content: isXiHaiAn
-        ? ['视频资源']
-        : ['政务云资源', '视频资源' /**',感知资源' */, '城市云脑会客厅'],
-    },
-  ])
-  let clickList = ref([]) //存储点击的tab
-  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)
+const apply = async () => {
+  if (selectedRowKeys.value.length != 0) {
+    // 判断最大数量
+    let maxNumRes = await judegNumber()
+    if (maxNumRes.data.code != 0) {
+      return
+    }
     let arr = [
       {
         arr: [
           {
-            description: data.description,
-            resourceId: data.id,
-            resourceName: data.wrjName,
-            type: data.type,
+            description: '',
+            note1: JSON.stringify(selectedList.value),
+            resourceId: '1522550195055828996',
+            resourceName: '摄像头列表',
+            type: '基础设施',
           },
         ],
-        deptId: dept.deptId || data.deptId || '',
+        deptId: dept.deptId,
         deptName: dept.deptName,
       },
     ]
+    console.log('一键申请', arr)
     localStorage.setItem('applyList', JSON.stringify(arr))
     router.push({
       path: '/apply',
     })
+  } else {
+    message.error('请选择需要申请的数据')
   }
-  if (whoShow1.value.itShowXiHaiAn) {
-    tabList.value[0].content.push('无人机')
-    tabList.value[0].content.push('单兵设备')
+}
+const goToWeb = () => {
+  switch (selectType.value) {
+    case '政务云资源':
+      window.open('http://15.72.183.88:8760/yzy/login')
+      break
+    case '视频资源':
+      window.open('http://15.72.183.88:8860/video')
+      break
+    default:
+      break
   }
-
-  // 单个预览，当前点击数据
-  const rowClickData = ref(null)
-  // 打开视频预览
-  const openVideo = (id, item) => {
-    rowClickData.value = item
-    // 单个预览
-    if (item && item.status != 1) {
-      return message.warning('当前设备离线, 不可预览！')
-    }
-    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 wrjFlag = ref(false)
+// 西海岸-视频资源loading
+const loadingCamera = ref(false)
+const getCamera = (flag, str) => {
+  loadingCamera.value = true
+  if (flag) {
+    mapSearchParam.value.cameraName = str
   }
-  // 打开图片预览
-  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,
-        content: [],
-      }
-      clickList.value.push(params)
-    })
-    mybus.off('tranferToList')
-    mybus.on('tranferToList', () => {
-      console.log('获取到的列表数据')
-    })
-  }
-
-  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 = roomEndTime.value.substr(0, 2)
-      for (let i = hour; i < 24; i++) {
-        hours.push(i)
-      }
-      return hours
-    }
-  }
-  //获取不可选择的分钟
-  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'])
-  const selectType = ref('政务云资源')
-  //表格的高度
-  let tableHeight = ref('600')
-  //tab切换点击事件
-  const tabClick = (indexFather, name) => {
-    console.log(
-      '点击tab================>',
-      indexFather,
-      name,
-      clickList.value,
-      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 = '视频标签'
-        }
-        selectType.value = '视频资源'
-        console.log('444------------>', 444)
-      } 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 = '政务云资源分类'
-        }
-        selectType.value = '政务云资源'
-      } else if (name == '感知资源') {
-        room.value = true
-        tableHeight.value = 330
-        showMap.value = true
-        dataSource.value = []
-        dataSource2.value = []
-        pagination.value.total = 0
-        selectType.value = '感知资源'
-      } else if (name == '城市云脑会客厅') {
-      }
-      clickList.value[indexFather].content.splice(
-        clickList.value[indexFather].content.indexOf(name),
-        1
-      )
-    } else {
-      if (name == '视频资源') {
-        selectType.value = '视频资源'
-        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)
-          })
-        }
-        mapSearchParam.value.gpsX = ''
-        mapSearchParam.value.gpsY = ''
-        mapSearchParam.value.radius = ''
-        mapSearchParam.value.type = ''
-        mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + ''
-        emits('add', 1)
-        getCamera()
-      } else if (name == '政务云资源') {
-        selectType.value = '政务云资源'
-        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 == '感知资源') {
-        selectType.value = '感知资源'
-        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
-    console.log(
-      'clickList.value[indexFather].content[0]------------>',
-      clickList.value[indexFather].content[0]
-    )
-
-    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
-        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)
-        })
-      }
-      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)
-        })
-      }
-      batchPicVisible.value = true
-    } else {
-      message.error('请选择需要预览的数据')
-    }
-  }
-  // 清空
-  const nullClick = () => {
-    if (clickList.value[1]) {
-      clickList.value[1].content = []
-    }
-    mapSearchParam.value.labelCodes = ''
-    getCamera()
-  }
-  // 重置
-  const clean = () => {
-    mapSearchParam.value.cameraName = ''
-    selectedList.value = []
-    selectedRowKeys.value = []
-    videoList.value = []
-    pagination.value.current = 1
-    mapSearchParam.value.pageNum = 1
-    mapSearchParam.value.type = 0
-    pagination.value.pageSize = 10
-    getCamera()
-  }
-  const videoClean = () => {
-    //视频预览弹窗关闭后不清除选中行
-    videoList.value = []
-    current.value = 1
-  }
-  // 改变批量预览的分页
-  const changePage = (page) => {}
-  // 一键申请
-  const dept = reactive({})
-  if (infrastructure) {
-    dept.deptId = infrastructure.deptId || ''
-    dept.deptName = infrastructure.deptName || ''
-  }
-
-  // 西海岸--判断设备最大数量个数
-  const judegNumber = () => {
-    return new Promise((resolve, reject) => {
-      getMaxApplyNum(selectedRowKeys.value.length)
-        .then((res) => {
-          resolve(res)
-        })
-        .catch((err) => {
-          reject(err)
-        })
-    })
-  }
-
-  const apply = async () => {
-    if (selectedRowKeys.value.length != 0) {
-      // 判断最大数量
-      let maxNumRes = await judegNumber()
-      if (maxNumRes.data.code != 0) {
-        return
-      }
-      let arr = [
-        {
-          arr: [
-            {
-              description: '',
-              note1: JSON.stringify(selectedList.value),
-              resourceId: '1522550195055828996',
-              resourceName: '摄像头列表',
-              type: '基础设施',
-            },
-          ],
-          deptId: dept.deptId,
-          deptName: dept.deptName,
-        },
-      ]
-      console.log('一键申请', arr)
-      localStorage.setItem('applyList', JSON.stringify(arr))
-      router.push({
-        path: '/apply',
-      })
-    } else {
-      message.error('请选择需要申请的数据')
-    }
-  }
-  const goToWeb = () => {
-    switch (selectType.value) {
-      case '政务云资源':
-        window.open('http://15.72.183.88:8760/yzy/login')
-        break
-      case '视频资源':
-        window.open('http://15.72.183.88:8860/video')
-        break
-      default:
-        break
-    }
-  }
-  const wrjFlag = ref(false)
-  // 西海岸-视频资源loading
-  const loadingCamera = ref(false)
-  const getCamera = (flag, str) => {
-    loadingCamera.value = true
-    if (flag) {
-      mapSearchParam.value.cameraName = str
-    }
-    console.log('初始化调用')
-    console.log(
-      '不选左侧树的时候不调用接口',
-      mapSearchParam.value,
-      selectType.value
-    )
-    if (!whoShow1.value.itShowXiHaiAn) {
-      if (selectType.value == '视频资源') {
-        getCameraByParentId(mapSearchParam.value)
-          .then((res) => {
-            console.log('res--查询摄像头---------->', res)
-            loadingCamera.value = false
-            dataSource.value = res.data.data
-            pagination.value.total = res.data.count
-          })
-          .catch((err) => {
-            loadingCamera.value = false
-            message.error(err)
-          })
-      } else {
-        loadingCamera.value = false
-      }
-    } else {
-      let params = {
-        regionId:
-          mapSearchParam.value.parentId || '70be8c5b664f4bcf869d82f2e8335051',
-        pageNum: mapSearchParam.value.pageNum,
-        pageSize: mapSearchParam.value.pageSize,
-        longitude: mapSearchParam.value.gpsX || '',
-        latitude: mapSearchParam.value.gpsY || '',
-        radius: mapSearchParam.value.radius || '',
-        name: mapSearchParam.value.cameraName,
-        type: mapSearchParam.value.type,
-        borderPolygonList: mapSearchParam.value.borderPolygonList || [],
-      }
-      // 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]
-        } else {
-          if (i != 1) {
-            paramsFather += `&${key}=` + params[key]
-            i += 1
-          } else if (i == 1) {
-            paramsFather += `${key}=` + params[key]
-            i += 1
-          }
-        }
-      }
-      getCameraByCondition(params)
+  console.log('初始化调用')
+  console.log(
+    '不选左侧树的时候不调用接口',
+    mapSearchParam.value,
+    selectType.value
+  )
+  if (!whoShow1.value.itShowXiHaiAn) {
+    if (selectType.value == '视频资源') {
+      getCameraByParentId(mapSearchParam.value)
         .then((res) => {
           console.log('res--查询摄像头---------->', res)
           loadingCamera.value = false
@@ -1909,446 +1590,364 @@
           loadingCamera.value = false
           message.error(err)
         })
-    }
-  }
-  defineExpose({
-    getCamera,
-  })
-  //加入申购车
-  const addShoppingCart = () => {
-    if (selectedList.value.length > 0) {
-      let _arr = []
-      selectedList.value.map((v) => {
-        _arr.push({
-          delFlag: '0',
-          resourceId: v.idtCameraChannel,
-          note1: [v],
-        })
-      })
-      xhaAddCart(_arr).then((res) => {
-        if (res.data.code !== 0) {
-          return message.error(res.data.msg)
-        }
-        message.success('添加申购车成功！')
-        mybus.emit('getSgcNum')
-      })
     } else {
-      message.error('请选择需要添加申购车的数据')
+      loadingCamera.value = false
     }
-  }
-  // 表格
-  const dataSource = ref([])
-  const dataSource2 = ref([])
-  const statusText = ref({
-    0: '离线',
-    1: '在线',
-  })
-  const columns = ref([
-    {
-      title: '名称',
-      dataIndex: 'channelName',
-      key: 'channelName',
-    },
-    {
-      title: '归属',
-      dataIndex: 'managementUnitName',
-      width: '60%',
-      key: 'managementUnitName',
-    },
-    {
-      title: '操作',
-      dataIndex: 'operation',
-      width: '10%',
-      key: 'channelId',
-    },
-  ])
-  // 西海岸--状态展示
-  if (isXiHaiAn) {
-    columns.value.splice(2, 0, {
-      title: '状态',
-      dataIndex: 'status',
-      width: '10%',
-      key: 'status',
-    })
-  }
-  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 onSelectChange = (
-    record,
-    selected,
-    selectedRows,
-    nativeEvent,
-    type
-  ) => {
-    record = JSON.parse(JSON.stringify(record))
-    if (selected) {
-      if (selectedRowKeys.value.length == 1000) {
-        message.warning('最多只能添加1000个摄像头！')
+  } else {
+    let params = {
+      regionId:
+        mapSearchParam.value.parentId || '70be8c5b664f4bcf869d82f2e8335051',
+      pageNum: mapSearchParam.value.pageNum,
+      pageSize: mapSearchParam.value.pageSize,
+      longitude: mapSearchParam.value.gpsX || '',
+      latitude: mapSearchParam.value.gpsY || '',
+      radius: mapSearchParam.value.radius || '',
+      name: mapSearchParam.value.cameraName,
+      type: mapSearchParam.value.type,
+      borderPolygonList: mapSearchParam.value.borderPolygonList || [],
+    }
+    // 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]
       } else {
-        selectedList.value.push(record)
-        selectedRowKeys.value.push(record.channelCode || record.channelId)
-      }
-    } else {
-      selectedList.value.forEach((ele, index) => {
-        if (ele.channelCode == record.channelCode) {
-          selectedList.value.splice(index, 1)
+        if (i != 1) {
+          paramsFather += `&${key}=` + params[key]
+          i += 1
+        } else if (i == 1) {
+          paramsFather += `${key}=` + params[key]
+          i += 1
         }
-      })
-      selectedRowKeys.value.splice(
-        selectedRowKeys.value.indexOf(record.channelCode || record.channelId),
-        1
-      )
-    }
-    mybus.emit('selectTablePoint', selectedList.value)
-    console.log('已选中======================>', selectedList.value)
-  }
-  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.forEach((ele, index) => {
-            if (ele.channelCode == record.channelCode) {
-              selectedList.value.splice(index, 1)
-            }
-          })
-          selectedRowKeys.value.splice(
-            selectedRowKeys.value.indexOf(val.channelCode || val.channelId),
-            1
-          )
-        })
       }
+    }
+    getCameraByCondition(params)
+      .then((res) => {
+        console.log('res--查询摄像头---------->', res)
+        loadingCamera.value = false
+        dataSource.value = res.data.data
+        pagination.value.total = res.data.count
+      })
+      .catch((err) => {
+        loadingCamera.value = false
+        message.error(err)
+      })
+  }
+}
+defineExpose({
+  getCamera,
+})
+//加入申购车
+const addShoppingCart = () => {
+  if (selectedList.value.length > 0) {
+    let _arr = []
+    selectedList.value.map((v) => {
+      _arr.push({
+        delFlag: '0',
+        resourceId: v.idtCameraChannel,
+        note1: [v],
+      })
+    })
+    xhaAddCart(_arr).then((res) => {
+      if (res.data.code !== 0) {
+        return message.error(res.data.msg)
+      }
+      message.success('添加申购车成功！')
+      mybus.emit('getSgcNum')
+    })
+  } else {
+    message.error('请选择需要添加申购车的数据')
+  }
+}
+// 表格
+const dataSource = ref([])
+const dataSource2 = ref([])
+const statusText = ref({
+  0: '离线',
+  1: '在线',
+})
+const columns = ref([
+  {
+    title: '名称',
+    dataIndex: 'channelName',
+    key: 'channelName',
+  },
+  {
+    title: '归属',
+    dataIndex: 'managementUnitName',
+    width: '60%',
+    key: 'managementUnitName',
+  },
+  {
+    title: '操作',
+    dataIndex: 'operation',
+    width: '10%',
+    key: 'channelId',
+  },
+])
+// 西海岸--状态展示
+if (isXiHaiAn) {
+  columns.value.splice(2, 0, {
+    title: '状态',
+    dataIndex: 'status',
+    width: '10%',
+    key: 'status',
+  })
+}
+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 onSelectChange = (
+  record,
+  selected,
+  selectedRows,
+  nativeEvent,
+  type
+) => {
+  record = JSON.parse(JSON.stringify(record))
+  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.forEach((ele, index) => {
+      if (ele.channelCode == record.channelCode) {
+        selectedList.value.splice(index, 1)
+      }
+    })
+    selectedRowKeys.value.splice(
+      selectedRowKeys.value.indexOf(record.channelCode || record.channelId),
+      1
+    )
+  }
+  mybus.emit('selectTablePoint', selectedList.value)
+  console.log('已选中======================>', selectedList.value)
+}
+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
-        )
+        selectedList.value.forEach((ele, index) => {
+          if (ele.channelCode == record.channelCode) {
+            selectedList.value.splice(index, 1)
+          }
+        })
         selectedRowKeys.value.splice(
           selectedRowKeys.value.indexOf(val.channelCode || val.channelId),
           1
         )
       })
     }
-    console.log('heiheiheiehiehei', selected, selectedRows, changeRows)
-    mybus.emit('selectTablePoint', selectedList.value)
+  } 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)
+  mybus.emit('selectTablePoint', selectedList.value)
+}
 
-  // 切换tab
-  const handleTableChange = (val) => {
-    pagination.value.current = val.current
-    pagination.value.pageSize = val.pageSize
-    mapSearchParam.value.pageNum = val.current
-    mapSearchParam.value.pageSize = val.pageSize
+// 切换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 {
-      getCamera()
-    }
+  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 {
+    getCamera()
   }
+}
 
-  // 视频预览 提示
-  const videoShowMsg = (index) => {
-    let itemData = null
-    if (index) {
-      itemData = selectedList.value[index]
-    }
-    let msg = '请申请后在我的申请中预览视频!'
-    if (
-      (itemData && itemData.status != 1) ||
-      (rowClickData.value && rowClickData.value.status != 1)
-    ) {
-      msg = '当前视频离线不可预览!'
-    } else {
-      msg = '请申请后在我的申请中预览视频!'
-    }
-    message.warning(msg)
+// 视频预览 提示
+const videoShowMsg = (index) => {
+  let itemData = null
+  if (index) {
+    itemData = selectedList.value[index]
   }
+  let msg = '请申请后在我的申请中预览视频!'
+  if (
+    (itemData && itemData.status != 1) ||
+    (rowClickData.value && rowClickData.value.status != 1)
+  ) {
+    msg = '当前视频离线不可预览!'
+  } else {
+    msg = '请申请后在我的申请中预览视频!'
+  }
+  message.warning(msg)
+}
 
-  // 获取用户信息
-  const userInfo = ref(null)
-  const handleUser = () => {
-    getUser()
-      .then((res) => {
-        if (res.data.code != 0) {
-          return message.warning(res.data.msg)
-        }
-        userInfo.value = res.data.data || {}
-        userInfo.value.usernameShow =
-          '西海岸能力超市' +
-          (userInfo.value.deptName || '') +
-          (userInfo.value.username || '')
-        userInfo.value.realNameShow =
-          '西海岸能力超市' +
-          (userInfo.value.deptName || '') +
-          (userInfo.value.realName || '')
-      })
-      .catch((err) => {
-        message.warning(err)
-      })
-  }
+// 获取用户信息
+const userInfo = ref(null)
+const handleUser = () => {
+  getUser()
+    .then((res) => {
+      if (res.data.code != 0) {
+        return message.warning(res.data.msg)
+      }
+      userInfo.value = res.data.data || {}
+      userInfo.value.usernameShow =
+        '西海岸能力超市' +
+        (userInfo.value.deptName || '') +
+        (userInfo.value.username || '')
+      userInfo.value.realNameShow =
+        '西海岸能力超市' +
+        (userInfo.value.deptName || '') +
+        (userInfo.value.realName || '')
+    })
+    .catch((err) => {
+      message.warning(err)
+    })
+}
 </script>
 <style lang="less" scoped>
-  .infrastructrueBox {
-    padding: 0.2rem;
+.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;
     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;
+    .contentNum {
+      position: relative;
+      display: flex;
+
+      p {
         color: #666666;
-        cursor: pointer;
-        padding: 0 0.08rem;
+        padding: 0;
+        margin: 0;
+
+        span {
+          color: #0087ff;
+          font-size: 0.2rem;
+          font-weight: 500;
+        }
       }
 
-      .leftType {
-        margin: 0.2rem 0;
-        margin-right: 0.06rem;
+      p:first-of-type {
+        padding-right: 0.16rem;
+        margin-right: 0.16rem;
       }
 
-      .down {
-        background: #0087ff;
-        color: #ffffff;
-      }
-
-      .tabBox {
-        padding-bottom: 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);
       }
     }
 
-    .infrastructrue-content {
+    .contentRight {
+      position: relative;
       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);
-        }
+      .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);
       }
 
-      .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;
-        margin-left: 0.2rem;
 
-        // .ant-input-search {
-        //   max-width: 4rem;
-        // }
+        .ant-input-search {
+          max-width: 4rem;
+        }
+
         :deep(.ant-input) {
           width: 2rem;
           height: 0.36rem;
@@ -2365,276 +1964,417 @@
             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;
-        }
-      }
-    }
-
-    .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%;
+          background: #0558e1;
+          border-radius: 0.04rem;
         }
       }
 
-      .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;
-        }
+      .buttonAdd {
+        background: #0558e1;
+        border-radius: 0.04rem;
+        height: 0.36rem;
+        border-color: #0558e1;
+        margin-left: 0.1rem;
       }
     }
-
-    :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;
-      overflow-y: auto;
-    }
+.wrj {
+  .ant-modal-body {
+    height: 700px !important;
+    overflow-y: auto;
+  }
+}
+
+.modalClass {
+  .ant-modal-body {
+    height: 4rem !important;
+    overflow-y: scroll !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;
-      }
-    }
+  .ant-modal-title {
+    font-weight: 600;
   }
 
-  .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;
-      }
-    }
-  }
-
-  .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;
-    }
+.appModal {
+  .ant-modal-body {
+    height: 4.8rem !important;
+    overflow-y: scroll !important;
+  }
 
-    .ant-pagination-item-link {
-      background-color: #5580f7;
-    }
+  .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;
     }
   }
+}
 
-  /*禁用video的controls（要慎重！不要轻易隐藏掉，会导致点击视频不能播放）*/
-  video::-webkit-media-controls {
-    display: none !important;
+.single-preview-modal {
+  .ant-modal-header {
+    background: url(~@/assets/home/video-background.png) no-repeat;
+    background-size: cover;
   }
 
-  .video-cover {
-    position: absolute;
-    left: 0;
-    top: 0;
-    bottom: 0;
-    right: 0;
-    background: transparent;
-    z-index: 99999999;
-    cursor: pointer;
+  .ant-modal-title {
+    font-size: 0.16rem;
+    font-weight: 500;
+    color: #ffffff;
   }
 
-  .batch-video-cover {
-    position: absolute;
-    left: 0;
-    top: 0;
-    background: transparent;
-    height: 288px;
-    z-index: 99999999;
-    width: 512px;
-    margin-top: 14px;
-    cursor: pointer;
+  .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;
   }
 
-  .waterMark {
-    position: absolute;
-    z-index: 99999999;
-    color: #0058e1;
-    font-size: 22px;
-    font-weight: bold;
-    opacity: 0.4;
-    transform: rotate(-25deg);
-    width: 470px;
+  .ant-pagination-item-link {
+    background-color: #5580f7;
   }
 
-  // 左上
-  .waterMark-left-top {
-    left: 50px;
-    top: 100px;
-    text-align: left;
+  .ant-modal-header {
+    background: url(~@/assets/home/video-background.png) no-repeat;
+    background-size: cover;
   }
 
-  // 右上
-  .waterMark-right-top {
-    right: 50px;
-    top: 100px;
-    text-align: right;
+  .ant-modal-title {
+    font-size: 0.16rem;
+    font-weight: 500;
+    color: #ffffff;
   }
 
-  // 左下
-  .waterMark-left-bottom {
-    left: 50px;
-    bottom: 100px;
-    text-align: left;
+  .anticon {
+    color: #ffffff;
   }
+}
 
-  // 右下
-  .waterMark-right-bottom {
-    right: 50px;
-    bottom: 100px;
-    text-align: right;
-  }
+/*禁用video的controls（要慎重！不要轻易隐藏掉，会导致点击视频不能播放）*/
+video::-webkit-media-controls {
+  display: none !important;
+}
 
-  // 批量
-  .batch-waterMark {
-    position: absolute;
-    z-index: 99999999;
-    color: #0058e1;
-    font-size: 14px;
-    opacity: 0.4;
-    transform: rotate(-25deg);
-    width: 200px;
-  }
+.video-cover {
+  position: absolute;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  background: transparent;
+  z-index: 99999999;
+  cursor: pointer;
+}
 
-  // 左上
-  .batch-waterMark-left-top {
-    left: 30px;
-    top: 50px;
-    text-align: left;
-  }
+.batch-video-cover {
+  position: absolute;
+  left: 0;
+  top: 0;
+  background: transparent;
+  height: 288px;
+  z-index: 99999999;
+  width: 512px;
+  margin-top: 14px;
+  cursor: pointer;
+}
 
-  // 右上
-  .batch-waterMark-right-top {
-    text-align: right;
-    right: 30px;
-    top: 80px;
-  }
+.waterMark {
+  position: absolute;
+  z-index: 99999999;
+  color: #0058e1;
+  font-size: 22px;
+  font-weight: bold;
+  opacity: 0.4;
+  transform: rotate(-25deg);
+  width: 470px;
+}
 
-  // 左下
-  .batch-waterMark-left-bottom {
-    left: 30px;
-    bottom: 50px;
-    text-align: left;
-  }
+// 左上
+.waterMark-left-top {
+  left: 50px;
+  top: 100px;
+  text-align: left;
+}
 
-  // 右下
-  .batch-waterMark-right-bottom {
-    right: 20px;
-    bottom: 30px;
-    text-align: right;
+// 右上
+.waterMark-right-top {
+  right: 50px;
+  top: 100px;
+  text-align: right;
+}
+
+// 左下
+.waterMark-left-bottom {
+  left: 50px;
+  bottom: 100px;
+  text-align: left;
+}
+
+// 右下
+.waterMark-right-bottom {
+  right: 50px;
+  bottom: 100px;
+  text-align: right;
+}
+
+// 批量
+.batch-waterMark {
+  position: absolute;
+  z-index: 99999999;
+  color: #0058e1;
+  font-size: 14px;
+  opacity: 0.4;
+  transform: rotate(-25deg);
+  width: 200px;
+}
+
+// 左上
+.batch-waterMark-left-top {
+  left: 30px;
+  top: 50px;
+  text-align: left;
+}
+
+// 右上
+.batch-waterMark-right-top {
+  text-align: right;
+  right: 30px;
+  top: 80px;
+}
+
+// 左下
+.batch-waterMark-left-bottom {
+  left: 30px;
+  bottom: 50px;
+  text-align: left;
+}
+
+// 右下
+.batch-waterMark-right-bottom {
+  right: 20px;
+  bottom: 30px;
+  text-align: right;
+}
+
+.disabled-text {
+  cursor: not-allowed;
+  opacity: 0.5;
+  color: #666666;
+  &:hover {
+    color: #666666;
   }
+}
 </style>
diff --git a/front/src/views/login/index.vue b/front/src/views/login/index.vue
index c684ab11..7440960f 100644
--- a/front/src/views/login/index.vue
+++ b/front/src/views/login/index.vue
@@ -157,7 +157,7 @@
             password: Encrypt(this.form.password),
             username: this.form.username,
           })
-          window.localStorage.setItem('tokenStartTime', new Date().getTime())
+          // window.localStorage.setItem('tokenStartTime', new Date().getTime())
           window.sessionStorage.setItem('visits', JSON.stringify([]))
           console.log(
             '添加visits========================================>',
diff --git a/front/src/views/mynoticeView/components/NoticeList.vue b/front/src/views/mynoticeView/components/NoticeList.vue
index 5b20b970..a129075a 100644
--- a/front/src/views/mynoticeView/components/NoticeList.vue
+++ b/front/src/views/mynoticeView/components/NoticeList.vue
@@ -262,35 +262,27 @@ const goPage = (item) => {
     }
   }
 }
-let isQingDao = whoShow.itShowQingDao;
 
 // 更改消息状态
 const read = (item) => {
   if (selectData.value.length === 0 && !item) {
-    message.error('未选择消息！')
-    return
+    return message.error('未选择消息！')
   }
   console.log(selectData.value)
   if (item) {
-    // 已读状态
+    // 已读状态,跳转页面
     if (item.readStatus === 1) {
-      if(isQingDao) {
-        goPage(item)
-      }
-      // 跳转页面
-      return
+      return goPage(item)
     }
     mynoticeRead(item.id).then((res) => {
       if (res.data.code == 0) {
         message.success('通知已读！')
         mybus.emit('getMynotice')
         init()
-        if (isQingDao) {
-          // 页面跳转
-          setTimeout(() => {
-            goPage(item)
-          }, 1000)
-        }
+        // 页面跳转
+        setTimeout(() => {
+          goPage(item)
+        }, 1500)
       } else {
         message.error('操作失败！')
       }
diff --git a/front/src/views/personalCenter/components/AbilityApplication.vue b/front/src/views/personalCenter/components/AbilityApplication.vue
index fd66c448..3230512e 100644
--- a/front/src/views/personalCenter/components/AbilityApplication.vue
+++ b/front/src/views/personalCenter/components/AbilityApplication.vue
@@ -29,7 +29,7 @@
         <p>
           <span>应用背景：{{ props.refObj.applicationBackground }}</span>
         </p>
-        <p>
+        <p v-if="!whoShow1.itShowXiHaiAn">
           <span>期望效果：{{ props.refObj.effectWish }}</span>
         </p>
         <p v-if="props.refObj.enclosure">
@@ -159,26 +159,32 @@
                   <span class="channelName">{{ val.channelName }}</span>
                   <span class="type">基础设施</span>
                 </div>
-                <a-button type="primary" v-if="item.approveStatus == '通过' && whoShow1.itShowXiHaiAn"
-                  @click.stop="openVideo(val)">
-                  视频预览
-                </a-button>
-
+                <div>
+                  <a-button type="primary" v-if="item.approveStatus == '通过' && whoShow1.itShowXiHaiAn"
+                    @click.stop="openVideo(val)">
+                    视频预览
+                  </a-button>
+                  <div class="channelName" style="color:#ff7875" v-if="whoShow1.itShowXiHaiAn && item.ended">该流程已终止
+                  </div>
+                </div>
               </div>
               <div class="ability-bottom">
                 <div class="dec2">位置：{{ val.nodeName }}</div>
                 <div class="result" v-if="item.approveStatus == '通过'">
-                  申请结果：{{
-                  '列表地址：' +
+                  申请结果：
+                  <span>列表地址：</span><span style="cursor: pointer;" @click="openView(backUrl +
+                  'resource/getApplyCameraList/' +
+                  item.instanceId)">{{
                   backUrl +
                   'resource/getApplyCameraList/' +
-                  item.instanceId +
-                  ';' +
-                  '视频流地址：' +
+                  item.instanceId }}</span>
+                  <span>视频流地址：</span>
+                  <span style="cursor: pointer" @click="openView(backUrl +
+                  'resource/hls/getHls/?key=' +
+                  val.channelId)">{{
                   backUrl +
                   'resource/hls/getHls/?key=' +
-                  val.channelId
-                  }}
+                  val.channelId}}</span>
                 </div>
               </div>
             </div>
@@ -452,6 +458,10 @@ const handleUser = () => {
   })
 }
 
+const openView = (url) => {
+  window.open(url, '_blank')
+}
+
 </script>
 <style lang="less" scoped>
 .title {
@@ -530,7 +540,7 @@ const handleUser = () => {
         margin-left: 0.1rem;
 
         .ability {
-          height: 1.3rem;
+          height: 1.6rem;
           display: flex;
           border-bottom: 1px #eee solid;
           padding: 0.1rem 0;
@@ -732,6 +742,7 @@ const handleUser = () => {
   font-weight: bold;
   opacity: 0.4;
   transform: rotate(-25deg);
-  width: 470px
+  width: 470px;
+
 }
 </style>
diff --git a/front/src/views/personalCenter/components/ApplyDetails.vue b/front/src/views/personalCenter/components/ApplyDetails.vue
index 825354ae..f9cd16ae 100644
--- a/front/src/views/personalCenter/components/ApplyDetails.vue
+++ b/front/src/views/personalCenter/components/ApplyDetails.vue
@@ -1,9 +1,21 @@
 <template>
-  <DeviceApplyDetail v-if="showType === '设备申请'" :refObj="refObj"></DeviceApplyDetail>
+  <DeviceApplyDetail
+    v-if="showType === '设备申请'"
+    :refObj="refObj"
+  ></DeviceApplyDetail>
   <div class="form-container" v-else>
-    <AbilityApplication :refObj="refObj" v-if="showType === '能力申请'"></AbilityApplication>
-    <PutOnTheShelf :refObj="refObj" v-else-if="showType === '能力上架'"></PutOnTheShelf>
-    <OffTheShelf :refObj="refObj" v-else-if="showType === '能力下架'"></OffTheShelf>
+    <AbilityApplication
+      :refObj="refObj"
+      v-if="showType === '能力申请'"
+    ></AbilityApplication>
+    <PutOnTheShelf
+      :refObj="refObj"
+      v-else-if="showType === '能力上架'"
+    ></PutOnTheShelf>
+    <OffTheShelf
+      :refObj="refObj"
+      v-else-if="showType === '能力下架'"
+    ></OffTheShelf>
     <Demand :refObj="refObj" v-else-if="showType === '能力需求'"></Demand>
     <Comment :refObj="refObj" v-else-if="showType === '需求评论'"></Comment>
     <OtherApplications :refObj="refObj" v-else></OtherApplications>
@@ -23,258 +35,263 @@
   </div>
 </template>
 <script setup>
-import AbilityApplication from './AbilityApplication.vue'
-import PutOnTheShelf from './PutOnTheShelf .vue'
-import OffTheShelf from './OffTheShelf.vue'
-import Demand from './Demand.vue'
-import Comment from './Comment.vue'
-import DeviceApplyDetail from './DeviceApplyDetail.vue'
-import OtherApplications from '@/views/personalCenter/components/OtherApplications '
-import { onMounted, reactive, defineProps, ref } from 'vue'
-import Cookies from 'js-cookie'
-// import { baseURL } from '@/config'
-import qs from 'qs'
-import {
-  getApplyForm,
-  getTaskHandleDetailInfo,
-  getDemandForm,
-  nengliziyuanshangjiaapply,
-  getTaskVariables,
-} from '@/api/personalCenter'
-import { selectOneDel } from '@/api/home'
-const props = defineProps({
-  processDefinitionName: { type: String, default: null },
-  businessKey: { type: String, default: null },
-  processInstanceId: { type: String, default: null },
-  resourceId: { type: String, default: null },
-  refObj: { type: Object, default: null },
-  showType: { type: String, default: null },
-})
-const refObj = ref({})
-const showType = ref('')
-// eslint-disable-next-line vue/no-setup-props-destructure
-refObj.value = props.refObj
-// eslint-disable-next-line vue/no-setup-props-destructure
-showType.value = props.showType
-//流转详情
-const dataSource = reactive({ data: [] })
-console.log('refObj------------>', refObj);
-
-// console.log(props.refObj, '---------------------------------------')
-
-const downloadFile = (path, name) => {
-  const xhr = new XMLHttpRequest()
-  xhr.open('get', path)
-  xhr.responseType = 'blob'
-  xhr.send()
-  xhr.onload = function () {
-    if (this.status === 200 || this.status === 304) {
-      // 如果是IE10及以上，不支持download属性，采用msSaveOrOpenBlob方法，但是IE10以下也不支持msSaveOrOpenBlob
-      if ('msSaveOrOpenBlob' in navigator) {
-        navigator.msSaveOrOpenBlob(this.response, name)
-        return
-      }
-      // const blob = new Blob([this.response], { type: xhr.getResponseHeader('Content-Type') });
-      // const url = URL.createObjectURL(blob);
-      const url = URL.createObjectURL(this.response)
-      const a = document.createElement('a')
-      a.style.display = 'none'
-      a.href = url
-      a.download = name
-      document.body.appendChild(a)
-      a.click()
-      document.body.removeChild(a)
-      URL.revokeObjectURL(url)
-    }
-  }
-}
-//表单信息
-const formName = reactive({
-  user: '',
-  phone: '',
-  unit: '',
-  area: '',
-  system: '',
-  scene: '',
-  basis: '',
-  id: '',
-})
-let shifoushizujian = ref('')
-let nameNotShow = ref('')
-let algorithmShow = ref('')
-const dataForm = reactive({ data: {} })
-const columns = [
-  {
-    title: '任务名称',
-    dataIndex: 'activityName',
-    key: 'activityName',
-  },
-  {
-    title: '处理人',
-    dataIndex: 'assigneeName',
-    key: 'assigneeName',
-  },
-  {
-    title: '任务开始时间',
-    dataIndex: 'startTime',
-    key: 'startTime',
-  },
-  {
-    title: '任务结束时间',
-    dataIndex: 'endTime',
-    key: 'endTime',
-  },
-  {
-    title: '审核意见',
-    dataIndex: 'comment',
-    key: 'comment',
-  },
-  {
-    title: '任务时长/秒',
-    dataIndex: 'durationInSeconds',
-    key: 'durationInSeconds',
-  },
-]
-const getInfo = () => {
-  console.log(props.processInstanceId, '============================')
-  if (props.processDefinitionName == '能力申请') {
-    // getTaskVariables({ taskId: props.processInstanceId }).then((res) => {
-    //   console.log('获取数据====================>', res.data.data)
-    // })
-  }
-  if (props.processDefinitionName == '能力申请流程') {
-    getApplyForm(props.businessKey).then((res) => {
-      const { data } = res.data
-      console.log(data)
-      formName.user = data.user
-      formName.phone = data.phone
-      formName.unit = data.unit
-      formName.area = data.area
-      formName.system = data.system
-      formName.scene = data.scene
-      formName.enclosure = data.enclosure
-      formName.basis = data.basis
-    })
-  }
-  if (props.processDefinitionName == '能力需求申请') {
-    getDemandForm(props.businessKey).then((res) => {
-      const { data } = res.data
-      console.log(data)
-      formName.applyUserName = data.applyUserName
-      formName.applyUserPhone = data.applyUserPhone
-      formName.applyUserDeptName = data.applyUserDeptName
-      formName.detailsField = data.detailsField
-      formName.demandDetails = data.demandDetails
-      formName.detailsType = data.detailsType
-      formName.demandSubject = data.demandSubject
-      formName.enclosure = data.enclosure
-    })
-  }
-  if (props.processDefinitionName == '能力资源上架') {
-    // debugger
-    nengliziyuanshangjiaapply(props.businessKey).then((res) => {
-      // const { data } = res.data
-      dataForm.data = res.data.data.resourceDTO
-      if (res.data.data.resourceDTO.type == '应用资源') {
-        shifoushizujian.value = true
-      } else {
-        shifoushizujian.value = false
-        console.log(res.data.data.resourceDTO)
-        res.data.data.resourceDTO.infoList.forEach((val) => {
-          console.log(val, '111111111111111111111111')
-          if (val.attrValue === '智能算法') {
-            nameNotShow.value = true
-            algorithmShow.value = false
-            console.log(nameNotShow.value, algorithmShow.value, 'wowowo')
-          }
-        })
-      }
-      console.log('222222222222', dataForm.data)
-    })
-  }
-  if (props.processDefinitionName == '能力资源下架') {
-    // debugger
-    selectOneDel(props.resourceId).then((res) => {
-      // const { data } = res.data
-      dataForm.data = res.data.data
-    })
-  }
-}
-
-const getLiuZhuanInfo = () => {
-  const params = qs.stringify({
-    processInstanceId: props.processInstanceId,
+  import AbilityApplication from './AbilityApplication.vue'
+  import PutOnTheShelf from './PutOnTheShelf .vue'
+  import OffTheShelf from './OffTheShelf.vue'
+  import Demand from './Demand.vue'
+  import Comment from './Comment.vue'
+  import DeviceApplyDetail from './DeviceApplyDetail.vue'
+  import OtherApplications from '@/views/personalCenter/components/OtherApplications '
+  import { onMounted, reactive, defineProps, ref } from 'vue'
+  import Cookies from 'js-cookie'
+  // import { baseURL } from '@/config'
+  import qs from 'qs'
+  import {
+    getApplyForm,
+    getTaskHandleDetailInfo,
+    getDemandForm,
+    nengliziyuanshangjiaapply,
+    getTaskVariables,
+  } from '@/api/personalCenter'
+  import { selectOneDel } from '@/api/home'
+  const props = defineProps({
+    processDefinitionName: { type: String, default: null },
+    businessKey: { type: String, default: null },
+    processInstanceId: { type: String, default: null },
+    resourceId: { type: String, default: null },
+    refObj: { type: Object, default: null },
+    showType: { type: String, default: null },
   })
-  getTaskHandleDetailInfo(params).then((res) => {
-    let arr = []
-    res.data.data.forEach((item) => {
-      arr.push(item)
-    })
-    dataSource.data.push([props.processInstanceId, arr])
-  })
-}
+  const refObj = ref({})
+  const showType = ref('')
+  // eslint-disable-next-line vue/no-setup-props-destructure
+  refObj.value = props.refObj
+  // eslint-disable-next-line vue/no-setup-props-destructure
+  showType.value = props.showType
+  //流转详情
+  const dataSource = reactive({ data: [] })
+  console.log('refObj------------>', refObj)
 
-onMounted(() => {
-  // getInfo()
-  if (props.refObj.resourceApplication) {
-    dataSource.data = []
-    for (const key in props.refObj.resourceApplication) {
-      if (props.refObj.resourceApplication[key].length > 0) {
-        props.refObj.resourceApplication[key].map((item) => {
-          dataSource.data.push([item.instanceId, item.taskHandleDetailInfo])
-        })
+  // console.log(props.refObj, '---------------------------------------')
+
+  const downloadFile = (path, name) => {
+    const xhr = new XMLHttpRequest()
+    xhr.open('get', path)
+    xhr.responseType = 'blob'
+    xhr.send()
+    xhr.onload = function () {
+      if (this.status === 200 || this.status === 304) {
+        // 如果是IE10及以上，不支持download属性，采用msSaveOrOpenBlob方法，但是IE10以下也不支持msSaveOrOpenBlob
+        if ('msSaveOrOpenBlob' in navigator) {
+          navigator.msSaveOrOpenBlob(this.response, name)
+          return
+        }
+        // const blob = new Blob([this.response], { type: xhr.getResponseHeader('Content-Type') });
+        // const url = URL.createObjectURL(blob);
+        const url = URL.createObjectURL(this.response)
+        const a = document.createElement('a')
+        a.style.display = 'none'
+        a.href = url
+        a.download = name
+        document.body.appendChild(a)
+        a.click()
+        document.body.removeChild(a)
+        URL.revokeObjectURL(url)
       }
     }
-  } else {
-    getLiuZhuanInfo()
   }
-})
-
-const getResourceURL = () => {
-  console.log('111111111111111111111111111111', Cookies.get('token'))
-  const params = qs.stringify({
-    token: Cookies.get('token'),
-    // processInstanceId: this.dataForm.processInstanceId
-    processInstanceId: props.processInstanceId,
+  //表单信息
+  const formName = reactive({
+    user: '',
+    phone: '',
+    unit: '',
+    area: '',
+    system: '',
+    scene: '',
+    basis: '',
+    id: '',
   })
-  return `${window.SITE_CONFIG.apiURL}/act/his/getInstImage?${params}`
-}
+  let shifoushizujian = ref('')
+  let nameNotShow = ref('')
+  let algorithmShow = ref('')
+  const dataForm = reactive({ data: {} })
+  const columns = [
+    {
+      title: '任务名称',
+      dataIndex: 'activityName',
+      key: 'activityName',
+    },
+    {
+      title: '处理部门',
+      dataIndex: 'assigneeDeptName',
+      key: 'assigneeDeptName',
+    },
+    {
+      title: '处理人',
+      dataIndex: 'assigneeName',
+      key: 'assigneeName',
+    },
+    {
+      title: '任务开始时间',
+      dataIndex: 'startTime',
+      key: 'startTime',
+    },
+    {
+      title: '任务结束时间',
+      dataIndex: 'endTime',
+      key: 'endTime',
+    },
+    {
+      title: '审核意见',
+      dataIndex: 'comment',
+      key: 'comment',
+    },
+    {
+      title: '任务时长',
+      dataIndex: 'duration',
+      key: 'duration',
+    },
+  ]
+  const getInfo = () => {
+    console.log(props.processInstanceId, '============================')
+    if (props.processDefinitionName == '能力申请') {
+      // getTaskVariables({ taskId: props.processInstanceId }).then((res) => {
+      //   console.log('获取数据====================>', res.data.data)
+      // })
+    }
+    if (props.processDefinitionName == '能力申请流程') {
+      getApplyForm(props.businessKey).then((res) => {
+        const { data } = res.data
+        console.log(data)
+        formName.user = data.user
+        formName.phone = data.phone
+        formName.unit = data.unit
+        formName.area = data.area
+        formName.system = data.system
+        formName.scene = data.scene
+        formName.enclosure = data.enclosure
+        formName.basis = data.basis
+      })
+    }
+    if (props.processDefinitionName == '能力需求申请') {
+      getDemandForm(props.businessKey).then((res) => {
+        const { data } = res.data
+        console.log(data)
+        formName.applyUserName = data.applyUserName
+        formName.applyUserPhone = data.applyUserPhone
+        formName.applyUserDeptName = data.applyUserDeptName
+        formName.detailsField = data.detailsField
+        formName.demandDetails = data.demandDetails
+        formName.detailsType = data.detailsType
+        formName.demandSubject = data.demandSubject
+        formName.enclosure = data.enclosure
+      })
+    }
+    if (props.processDefinitionName == '能力资源上架') {
+      // debugger
+      nengliziyuanshangjiaapply(props.businessKey).then((res) => {
+        // const { data } = res.data
+        dataForm.data = res.data.data.resourceDTO
+        if (res.data.data.resourceDTO.type == '应用资源') {
+          shifoushizujian.value = true
+        } else {
+          shifoushizujian.value = false
+          console.log(res.data.data.resourceDTO)
+          res.data.data.resourceDTO.infoList.forEach((val) => {
+            console.log(val, '111111111111111111111111')
+            if (val.attrValue === '智能算法') {
+              nameNotShow.value = true
+              algorithmShow.value = false
+              console.log(nameNotShow.value, algorithmShow.value, 'wowowo')
+            }
+          })
+        }
+        console.log('222222222222', dataForm.data)
+      })
+    }
+    if (props.processDefinitionName == '能力资源下架') {
+      // debugger
+      selectOneDel(props.resourceId).then((res) => {
+        // const { data } = res.data
+        dataForm.data = res.data.data
+      })
+    }
+  }
+
+  const getLiuZhuanInfo = () => {
+    const params = qs.stringify({
+      processInstanceId: props.processInstanceId,
+    })
+    getTaskHandleDetailInfo(params).then((res) => {
+      let arr = []
+      res.data.data.forEach((item) => {
+        arr.push(item)
+      })
+      dataSource.data.push([props.processInstanceId, arr])
+    })
+  }
+
+  onMounted(() => {
+    // getInfo()
+    if (props.refObj.resourceApplication) {
+      dataSource.data = []
+      for (const key in props.refObj.resourceApplication) {
+        if (props.refObj.resourceApplication[key].length > 0) {
+          props.refObj.resourceApplication[key].map((item) => {
+            dataSource.data.push([item.instanceId, item.taskHandleDetailInfo])
+          })
+        }
+      }
+    } else {
+      getLiuZhuanInfo()
+    }
+  })
+
+  const getResourceURL = () => {
+    console.log('111111111111111111111111111111', Cookies.get('token'))
+    const params = qs.stringify({
+      token: Cookies.get('token'),
+      // processInstanceId: this.dataForm.processInstanceId
+      processInstanceId: props.processInstanceId,
+    })
+    return `${window.SITE_CONFIG.apiURL}/act/his/getInstImage?${params}`
+  }
 </script>
 
 <style scoped lang="less">
-.form-container {
-  height: 6rem;
-  overflow-y: scroll;
-  padding: 20px 20px 30px 20px;
+  .form-container {
+    height: 6rem;
+    overflow-y: scroll;
+    padding: 20px 20px 30px 20px;
 
-  .title {
-    font-size: 18px;
-    color: #000;
-    font-weight: bold;
-    margin-bottom: 20px;
-    padding-left: 10px;
-    margin-top: 10px;
-    border-left: 6px #0058e1 solid;
+    .title {
+      font-size: 18px;
+      color: #000;
+      font-weight: bold;
+      margin-bottom: 20px;
+      padding-left: 10px;
+      margin-top: 10px;
+      border-left: 6px #0058e1 solid;
+    }
   }
-}
 
-:deep(.ant-table-thead)>tr>.ant-table-cell {
-  background: #0087ff;
-  color: #fff;
-  border: none;
-  text-align: center;
-  font-size: 16px;
-}
+  :deep(.ant-table-thead) > tr > .ant-table-cell {
+    background: #0087ff;
+    color: #fff;
+    border: none;
+    text-align: center;
+    font-size: 16px;
+  }
 
-:deep(.ant-table-tbody)>tr>.ant-table-cell:nth-child(5) {
-  // width: 110px;
-  // display: inline-block;
-  // white-space: nowrap;
-  // overflow: hidden;
-  // text-overflow: ellipsis;
-}
+  :deep(.ant-table-tbody) > tr > .ant-table-cell:nth-child(5) {
+    // width: 110px;
+    // display: inline-block;
+    // white-space: nowrap;
+    // overflow: hidden;
+    // text-overflow: ellipsis;
+  }
 
-.oddNumbers {
-  margin-bottom: 0.05rem;
-}
+  .oddNumbers {
+    margin-bottom: 0.05rem;
+  }
 </style>
diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue
index 4e1b1353..29c08390 100644
--- a/front/src/views/personalCenter/components/MyApply.vue
+++ b/front/src/views/personalCenter/components/MyApply.vue
@@ -3,16 +3,27 @@
     <div class="title" style="margin-bottom: 0.2rem">我的申请</div>
     <div class="tab" style="margin-bottom: 0.1rem">
       <span>类型</span>
-      <div :class="typeIndex == index ? 'tabclass' : ' '" @click="changeType(item, index)"
-        v-for="(item, index) in typeList" :key="index">
+      <div
+        :class="typeIndex == index ? 'tabclass' : ' '"
+        @click="changeType(item, index)"
+        v-for="(item, index) in typeList"
+        :key="index"
+      >
         {{ item }}
       </div>
     </div>
     <div class="tab">
       <span>申请状态</span>
-      <div :class="tabIndex == index ? 'tabclass' : ' '" @click="changeApplyState(item, index)"
-        v-for="(item, index) in tabList" :key="index">
-        <a-badge :count="item === '审核中' ? num.unfinished : num.finished" v-if="item !== '全部'">
+      <div
+        :class="tabIndex == index ? 'tabclass' : ' '"
+        @click="changeApplyState(item, index)"
+        v-for="(item, index) in tabList"
+        :key="index"
+      >
+        <a-badge
+          :count="item === '审核中' ? num.unfinished : num.finished"
+          v-if="item !== '全部'"
+        >
           {{ item }}
         </a-badge>
         <template v-else>
@@ -22,7 +33,11 @@
     </div>
     <div v-if="contentList.data.length > 0">
       <div class="content">
-        <div class="content-body" v-for="item in contentList.data" :key="item.index">
+        <div
+          class="content-body"
+          v-for="item in contentList.data"
+          :key="item.index"
+        >
           <div class="content-body-title">
             <span>申请单号：{{ item.applyNumber || '--' }}</span>
             <div></div>
@@ -33,7 +48,9 @@
             </template>
             <div class="content-body-title">
               <span>
-                名称：{{ item.cameraList ? item.system : item.title }}
+                名称：{{
+                  item.cameraList ? item.system : item.title || item.name
+                }}
               </span>
               <div></div>
             </div>
@@ -48,55 +65,121 @@
           </div>
           <div class="content-body-bottom">
             <div>申请日期：{{ item.createDate || item.startTime }}</div>
-            <div></div>
+            <!-- 西海岸--增加过期时间显示 -->
+            <div v-if="isXiHaiAn">过期时间：{{ item.expireDate || '' }}</div>
           </div>
           <div class="button-box">
-            <div class="button" v-if="typeName == '设备申请' && phoneSate.includes(item.state)"
-              @click="showPhoneModal(item)">
+            <div
+              class="button"
+              v-if="typeName == '设备申请' && phoneSate.includes(item.state)"
+              @click="showPhoneModal(item)"
+            >
               联系方式
             </div>
             <div class="button" @click="showDetail(item)">查看详情</div>
             <div class="button" @click="showAdd(item)" v-if="item.backToFirst">
               修改
             </div>
-            <svg t="1652233950228" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
-              p-id="5970" data-spm-anchor-id="a313x.7781069.0.i8" width="80" height="80" v-if="
+            <svg
+              t="1652233950228"
+              class="icon"
+              viewBox="0 0 1024 1024"
+              version="1.1"
+              xmlns="http://www.w3.org/2000/svg"
+              p-id="5970"
+              data-spm-anchor-id="a313x.7781069.0.i8"
+              width="80"
+              height="80"
+              v-if="
                 item.processDefinitionName != '能力资源下架' &&
                 (item.resourceStatus == 4 || item.resourceStatus == 5)
-              " style="position: absolute; top: 20px; left: -850px">
+              "
+              style="position: absolute; top: 20px; left: -850px"
+            >
               <path
                 d="M955.22053 256C813.82053 11.2 500.72053-72.6 255.92053 68.8S-72.67947 523.2 68.72053 768 523.22053 1096.6 768.02053 955.2c244.7-141.2 328.6-454.1 187.4-698.8 0-0.1-0.1-0.3-0.2-0.4zM762.02053 944.7c-239 138.1-544.8 56.2-682.9-182.8S22.92053 217.1 261.92053 79.1s544.8-56.2 682.9 182.8c137.9 239 56.1 544.6-182.8 682.8z"
-                fill="#515151" opacity=".5" p-id="5971"></path>
+                fill="#515151"
+                opacity=".5"
+                p-id="5971"
+              ></path>
               <path
                 d="M898.12053 289.2C775.02053 76 502.42053 2.9 289.22053 126 76.02053 249.1 3.02053 521.6 126.02053 734.8 249.12053 948 521.62053 1021.1 734.82053 898 947.92053 774.9 1021.02053 502.4 898.12053 289.2zM731.62053 892.8C521.32053 1014.3 252.42053 942.2 131.02053 731.9 9.52053 521.6 81.62053 252.7 291.92053 131.3 502.12053 9.9 771.02053 81.8 892.42053 292c121.5 210.3 49.5 479.3-160.8 600.8z"
-                fill="#515151" opacity=".5" p-id="5972"></path>
+                fill="#515151"
+                opacity=".5"
+                p-id="5972"
+              ></path>
               <path
                 d="M323.62053 176.8c3.6-2 6 0.8 8.8 2.8 6 4.4 12.4 8.8 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 13.6-5.6 20.8 4.8 6 10 11.6 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.4 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.4-1.9-3.9-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.7-0.8-0.3-1.6 0.6-2zM200.72053 289.2c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 13.6-5.6 20.8 4.8 6 10 11.6 14.8 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.4-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5c-8.4-2-16.8-4.4-25.2-6.4-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 3.6-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.4-1.2 0-1.6 0.8-2.4l0.2 0.4z m276.6-159.6c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 14-5.6 20.8 4.8 6 10 12 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.8-1.2-0.4-1.6 0.4-2.4l0.2 0.4z m141.9 29.6c3.6-2 6 0.8 8.8 2.8l18.8 12.8c7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 14-5.6 20.8 4.8 6 10 12 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4-7.7 0.4-15.2 0.8-22.4 0.8-4.4 6.8-8.4 13.2-12.8 20-1.6 2.4-4 5.1-7.2 4-2.4-1.9-3.9-4.7-4.4-7.7l-7.2-20.5c-8.4-2-16.8-4.4-25.2-6.4-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.5-1.2 0.2-1.6 0.6-2zM150.02053 430c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-4 14-5.6 20.8 4.8 6 10 11.6 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 3.6-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.7-0.8-0.3-1.5 0.6-2z m558.9 414.4c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.1 4.4-0.7 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.5-1.1 0.8-1.1 1.6-1.1h0.1z m-158.8 50c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.1-3.7-5.6-3.6-7.7-4-6.8-1.6-14-3.6-20.8-5.6l-7.7-22c-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2-1 4.2-1.7 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.4-0.8 0.8-0.8 1.7-0.7z m276.5-159.6c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8s-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.2 4.4-0.7 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0-0.8 0.8-1.2 1.6-1.2l0.1 0.1z m45.6-137.6c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-1.6-14-3.6-20.8-5.6l-7.7-22c-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.2-0.7 0.6-0.7 1.4-0.7h0.3zM402.72053 868c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.5-0.8 1-1.1 1.7-1.1z"
-                fill="#515151" opacity=".5" p-id="5973"></path>
+                fill="#515151"
+                opacity=".5"
+                p-id="5973"
+              ></path>
               <path
                 d="M386.42053 590.4l-43.8-75.9L207.02053 592.7l10.2 17.7L334.02053 543l23.4 40.4-90.5 52.2-13.5-23.4-18.7 10.8 53.1 92c9.1 15.8 21.2 19.5 36.4 10.7l98.8-57c6.2-3.6 11-9.3 13.4-16.1-1.4-15.9-6.2-31.2-14.2-45l-21.4 4.8c6.7 10.3 11 21.9 12.8 34-1 3.3-3.2 6-6.1 7.8l-88.3 51c-6.2 3.6-11.1 2.1-14.8-4.3l-27.3-47.4 109.3-63.1z m2.9-103.2l10.4 18.1 65.6-37.9 79.9 138.4 18.6-10.8-55.9-96.9c18.8-0.9 43.2-0.6 73 0.7l1.5-23.1c-29.8-0.3-58.4 0.4-86 2.6l-12.5-21.6 74.9-43.2-10.4-18.1-159.1 91.8zM669.52053 329l38.2 66.2 61.4-35.4-38.1-66.1-61.5 35.3z m72.4 24.2l-26.3 15.2-19-33 26.3-15.2 19 33zM599.02053 356.7l7.9 13.7-23.3 13.5 9.8 17 21.8-12.6c7.5 18.7 6.6 39.6-2.5 57.6l20.7 4.4c10.3-23.1 10.3-49.4 0-72.5l18.8-10.9c6 9.2 10.7 19.2 14.2 29.7 0.3 5-2.6 9.7-7.2 11.7-2.9 1.2-6.4 2.8-10.9 4.9l14.1 14.1c3.7-1.3 7.3-2.9 10.7-4.8 8.6-3.9 14.4-12.2 15.2-21.6-5.4-22.1-14.6-43-27.4-61.8l-36.1 20.8-7.9-13.7-17.9 10.5z m29.9 108.1l10 17.4 53.2-30.7c-7.8 23.7-20.6 45.4-37.5 63.6l20.6 11.1c18.6-24.2 30-53.1 33-83.4l29.8 51.5 18.4-10.7-29.8-51.5c27.4 11.5 57.2 16.3 86.9 14.1l3.5-23.5c-24.7 5.1-50.1 5-74.8-0.1l53.5-30.9-10-17.3-69.3 40-7.3-12.6-18.4 10.7L698.02053 425l-69.1 39.8z"
-                fill="#515151" opacity=".5" p-id="5974"></path>
+                fill="#515151"
+                opacity=".5"
+                p-id="5974"
+              ></path>
             </svg>
           </div>
         </div>
       </div>
       <div class="bottom">
-        <a-pagination size="small" pageSize="4" :total="total" :current="page" @change="handleCurrentChange"
-          @showSizeChange="handlePageSizeChange" :showSizeChanger="false" />
+        <a-pagination
+          size="small"
+          pageSize="4"
+          :total="total"
+          :current="page"
+          @change="handleCurrentChange"
+          @showSizeChange="handlePageSizeChange"
+          :showSizeChanger="false"
+        />
       </div>
     </div>
     <a-empty v-else />
-    <a-modal bodyStyle="padding:0.1rem 0" v-model:visible="detailsVisible" title="申请详情" style="width: 900px"
-      :footer="null" destroyOnClose="true" :maskClosable="false">
-      <apply-details :processDefinitionName="processDefinitionName" :businessKey="businessKey"
-        :processInstanceId="processInstanceId" :resourceId="resourceId" :refObj="refObj" :showType="showType">
-      </apply-details>
+    <a-modal
+      bodyStyle="padding:0.1rem 0"
+      v-model:visible="detailsVisible"
+      style="width: 1000px"
+      :footer="null"
+      destroyOnClose="true"
+      :maskClosable="false"
+    >
+      <template v-slot:title>
+        {{
+          refObj.description && itShowXiHaiAn
+            ? refObj.description + '申请详情'
+            : '申请详情'
+        }}
+      </template>
+      <apply-details
+        :processDefinitionName="processDefinitionName"
+        :businessKey="businessKey"
+        :processInstanceId="processInstanceId"
+        :resourceId="resourceId"
+        :refObj="refObj"
+        :showType="showType"
+      ></apply-details>
     </a-modal>
-    <a-modal v-model:visible="visible" title="下架原因" @ok="del()" @cancel="reason = ''">
+    <a-modal
+      v-model:visible="visible"
+      title="下架原因"
+      @ok="del()"
+      @cancel="reason = ''"
+    >
       <a-input v-model:value="reason" placeholder="请输入下架原因" />
     </a-modal>
-    <a-modal v-model:visible="videoVisible" title="已申请摄像头列表" @ok="videoVisible = false">
-      <a-table :columns="columns" :data-source="xVideoList" bordered :pagination="{ defaultPageSize: 6 }">
+    <a-modal
+      v-model:visible="videoVisible"
+      title="已申请摄像头列表"
+      @ok="videoVisible = false"
+    >
+      <a-table
+        :columns="columns"
+        :data-source="xVideoList"
+        bordered
+        :pagination="{ defaultPageSize: 6 }"
+      >
         <template #bodyCell="{ column, text }">
           <!-- <template>
         <a>{{ text }}</a>
@@ -107,746 +190,756 @@
   </div>
 
   <!-- 联系方式弹框 -->
-  <a-modal v-model:visible="phoneVisible" title="提示" @ok="phoneVisible = false">
+  <a-modal
+    v-model:visible="phoneVisible"
+    title="提示"
+    @ok="phoneVisible = false"
+  >
     <!-- 工业信息化局那个号，电话配这个号：199 6399 0996 -->
     <p>请联系工业信息化局，电话：199 6399 0996</p>
   </a-modal>
 </template>
 
 <script setup>
-import { onMounted, reactive, ref, onBeforeUnmount, h, defineProps } from 'vue'
-import {
-  getMyProcessInstancePage,
-  getTabilityapplication,
-  getByApplyFlag,
-  nengliziyuanshangjiaapply,
-  getDemandForm,
-  demandComment,
-  deviceApplylist,
-  getDeviceDetail,
-} from '@/api/personalCenter'
-import {
-  updateRes,
-  relaunch,
-  selectOne,
-  getApplyCameraList,
-  selectOneDel,
-} from '@/api/home'
-import { useRouter } from 'vue-router'
-import { message } from 'ant-design-vue'
-import ApplyDetails from '@/views/personalCenter/components/ApplyDetails'
-import mybus from '@/myplugins/mybus'
-import * as moment from 'moment'
+  import {
+    onMounted,
+    reactive,
+    ref,
+    onBeforeUnmount,
+    h,
+    defineProps,
+  } from 'vue'
+  import {
+    getMyProcessInstancePage,
+    getTabilityapplication,
+    getByApplyFlag,
+    nengliziyuanshangjiaapply,
+    getDemandForm,
+    demandComment,
+    deviceApplylist,
+    getDeviceDetail,
+  } from '@/api/personalCenter'
+  import {
+    updateRes,
+    relaunch,
+    selectOne,
+    getApplyCameraList,
+    selectOneDel,
+  } from '@/api/home'
+  import { useRouter } from 'vue-router'
+  import { message } from 'ant-design-vue'
+  import ApplyDetails from '@/views/personalCenter/components/ApplyDetails'
+  import mybus from '@/myplugins/mybus'
+  import * as moment from 'moment'
 
-const props = defineProps({
-  tabTypeName: { type: String, default: '' },
-})
-const router = useRouter()
-let typeList = ref([
-  '能力申请',
-  '能力上架',
-  '能力下架',
-  '能力需求',
-  '需求评论',
-  // '能力评价',
-])
-// 西海岸-设备申请
-let isXiHaiAn = whoShow.itShowXiHaiAn
-const phoneSate = ref([2, 3])
-if (isXiHaiAn) {
-  typeList.value.push('设备申请')
-}
-const typeStrObj = {
-  '能力上架': 'resourcemountapply',
-  '能力下架': 'resourcundercarriageapply',
-  '能力需求': 'abilitydemandapply',
-  '需求评论': 'comment_review',
-}
-let tabList = ref(['全部', '审核中', '审核完成'])
-const contentList = reactive({ data: [] })
-let tabIndex = ref(0)
-let typeIndex = ref(0)
-let typeName = ref(typeList.value[0])
-const videoVisible = ref(false)
-const numFlag = ref(true)
-const columns = ref([
-  {
-    title: '摄像头名称',
-    dataIndex: 'name',
-  },
-])
-const xVideoList = ref([])
-
-let name = ref('')
-const detailsVisible = ref(false)
-const detailsVisible2 = ref(false)
-const businessKey = ref('')
-const processInstanceId = ref('')
-const processDefinitionName = ref('')
-const resourceId = ref('')
-const reason = ref('')
-const visible = ref(false)
-const delObj = ref({})
-const taskId = ref('')
-const backUrl = ref(window.SITE_CONFIG.apiURL + '/')
-const refObj = ref({})
-const num = ref({
-  finished: 0,
-  unfinished: 0,
-})
-const total = ref('')
-const showType = ref('')
-const page = ref('1')
-const ended = ref('')
-const processDefinitionKey = ref('')
-const phoneVisible = ref(false)
-
-// 选择类型
-const changeType = (item, index) => {
-  console.log('item, index-----选择类型------->', item, index)
-  numFlag.value = true
-  num.value = []
-  showType.value = ''
-  tabIndex.value = 0
-  ended.value = ''
-  page.value = 1
-  typeIndex.value = index
-  typeName.value = item
-  getApplyList()
-}
-
-// 申请状态切换
-function changeApplyState(item, index) {
-  tabIndex.value = index
-  switch (item) {
-    case '审核中':
-      page.value = 1
-      ended.value = false
-      getApplyList()
-      break
-    case '审核完成':
-      page.value = 1
-      ended.value = true
-      getApplyList()
-      break
-    case '全部':
-      page.value = 1
-      ended.value = ''
-      getApplyList()
-      break
-  }
-}
-
-const showDetail = (item) => {
-  // 西海岸-申请时间过期，提示
+  const props = defineProps({
+    tabTypeName: { type: String, default: '' },
+  })
+  const router = useRouter()
+  let typeList = ref([
+    '能力申请',
+    '能力上架',
+    '能力下架',
+    '能力需求',
+    '需求评论',
+    // '能力评价',
+  ])
+  // 西海岸-设备申请
+  let isXiHaiAn = whoShow.itShowXiHaiAn
+  const itShowXiHaiAn = ref(isXiHaiAn)
+  const phoneSate = ref([2, 3])
   if (isXiHaiAn) {
-    if (item.expireDate) {
-      let diff = moment().diff(moment(item.expireDate), 'seconds')
-      if (diff > 0) {
-        return message.error('当前申请已过期！')
-      }
+    typeList.value.push('设备申请')
+  }
+  const typeStrObj = {
+    能力上架: 'resourcemountapply',
+    能力下架: 'resourcundercarriageapply',
+    能力需求: 'abilitydemandapply',
+    需求评论: 'comment_review',
+  }
+  let tabList = ref(['全部', '审核中', '审核完成'])
+  const contentList = reactive({ data: [] })
+  let tabIndex = ref(0)
+  let typeIndex = ref(0)
+  let typeName = ref(typeList.value[0])
+  const videoVisible = ref(false)
+  const numFlag = ref(true)
+  const columns = ref([
+    {
+      title: '摄像头名称',
+      dataIndex: 'name',
+    },
+  ])
+  const xVideoList = ref([])
+
+  let name = ref('')
+  const detailsVisible = ref(false)
+  const detailsVisible2 = ref(false)
+  const businessKey = ref('')
+  const processInstanceId = ref('')
+  const processDefinitionName = ref('')
+  const resourceId = ref('')
+  const reason = ref('')
+  const visible = ref(false)
+  const delObj = ref({})
+  const taskId = ref('')
+  const backUrl = ref(window.SITE_CONFIG.apiURL + '/')
+  const refObj = ref({})
+  const num = ref({
+    finished: 0,
+    unfinished: 0,
+  })
+  const total = ref('')
+  const showType = ref('')
+  const page = ref('1')
+  const ended = ref('')
+  const processDefinitionKey = ref('')
+  const phoneVisible = ref(false)
+
+  // 选择类型
+  const changeType = (item, index) => {
+    console.log('item, index-----选择类型------->', item, index)
+    numFlag.value = true
+    num.value = []
+    showType.value = ''
+    tabIndex.value = 0
+    ended.value = ''
+    page.value = 1
+    typeIndex.value = index
+    typeName.value = item
+    getApplyList()
+  }
+
+  // 申请状态切换
+  function changeApplyState(item, index) {
+    tabIndex.value = index
+    switch (item) {
+      case '审核中':
+        page.value = 1
+        ended.value = false
+        getApplyList()
+        break
+      case '审核完成':
+        page.value = 1
+        ended.value = true
+        getApplyList()
+        break
+      case '全部':
+        page.value = 1
+        ended.value = ''
+        getApplyList()
+        break
     }
   }
-  if (typeName.value == '能力申请' && item.applyFlag) {
-    getByApplyFlag(item.applyFlag).then((res) => {
-      if (res.data.code == 0) {
-        refObj.value = res.data.data
 
-        detailsVisible.value = true
-        processDefinitionName.value = item.processDefinitionName
-        businessKey.value = item.businessKey
-        processInstanceId.value = item.instanceId
-        resourceId.value = item.resourceId
-      } else {
-        message.error('数据请求失败！')
+  const cilckRowData = ref({})
+  const showDetail = (item) => {
+    cilckRowData.value = item
+    // 西海岸-申请时间过期，提示
+    if (isXiHaiAn) {
+      if (item.expireDate) {
+        let diff = moment().diff(moment(item.expireDate), 'seconds')
+        if (diff > 0) {
+          return message.error('当前申请已过期！')
+        }
       }
-    })
-  } else if (typeName.value == '设备申请') {
-    getDeviceDetailInfo(item.deviceId)
-      .then((res) => {
+    }
+    if (typeName.value == '能力申请' && item.applyFlag) {
+      getByApplyFlag(item.applyFlag).then((res) => {
         if (res.data.code == 0) {
           refObj.value = res.data.data
           detailsVisible.value = true
           processDefinitionName.value = item.processDefinitionName
+          businessKey.value = item.businessKey
+          processInstanceId.value = item.instanceId
+          resourceId.value = item.resourceId
+        } else {
+          message.error('数据请求失败！')
         }
       })
-      .catch((err) => { })
-  } else if (
-    Object.keys(typeStrObj).includes(typeName.value) ||
-    typeName.value == '能力评价'
-  ) {
-    refObj.value = item
-    detailsVisible.value = true
-    processDefinitionName.value = item.processDefinitionName
-    businessKey.value = item.businessKey
-    processInstanceId.value = item.processInstanceId
-    resourceId.value = item.resourceId
-  } else {
-    message.error('数据请求失败！')
-  }
-}
-const showVideoList = (item) => {
-  console.log('显示列表', item)
-  getApplyCameraList(item.processInstanceId).then((res) => {
-    console.log('res', res)
-    xVideoList.value = []
-    res.data.data.map((val) => {
-      xVideoList.value.push({ name: val.channelName, key: val.channelId })
-    })
-  })
-  videoVisible.value = true
-}
-const copyComment = (data) => {
-  let url = data
-  let oInput = document.createElement('input')
-  oInput.value = url
-  document.body.appendChild(oInput)
-  oInput.select() // 选择对象;
-  console.log(oInput.value)
-  document.execCommand('Copy') // 执行浏览器复制命令
-  message.success('复制成功')
-  oInput.remove()
-}
-const showAdd = (item) => {
-  if (item.processDefinitionKey == 'resourcemountapply') {
-    const data = {
-      id: item.resourceId,
-      taskId: item.currentTaskList[0].taskId,
-    }
-    if (item.dto.type == '组件服务') {
-      data.abilityToType = '组件服务'
-      data.componentTypeValue = item.dto.infoList.filter(
-        (val) => val.attrType == '组件类型'
-      )[0].attrValue
-    } else if (item.dto.type == '应用资源') {
-      data.abilityToType = '应用资源'
-    }
-    const newpage = router.resolve({
-      path: '/nenglishangjia', // 跳转的页面路由
-      query: data,
-    })
-    console.log('上架申请修改=================》', item)
-    window.open(newpage.href, '_blank')
-  } else if (item.processDefinitionKey == 'resourcundercarriageapply') {
-    selectOne(item.resourceId).then((res) => {
-      if (res.data.code == 0) {
-        delObj.value = res.data.data
-        reason.value = delObj.value.undercarriageReason
-        taskId.value = item.currentTaskList[0].taskId
-        visible.value = true
-        console.log('下架申请修改=================》', res.data.data)
-      }
-    })
-  } else if (item.processDefinitionKey == 'abilitydemandapply') {
-    const newpage = router.resolve({
-      path: '/addApplication', // 跳转的页面路由
-      query: {
-        id: item.businessKey,
-        taskId: item.currentTaskList[0].taskId,
-      },
-    })
-    console.log('需求申请修改=================》', item)
-    window.open(newpage.href, '_blank')
-  } else if (item.processDefinitionKey == 'abilityprocess') {
-    const newpage = router.resolve({
-      path: '/apply', // 跳转的页面路由
-      query: {
-        id: item.businessKey,
-        resourceId: item.resourceId,
-        name: item.name,
-        taskId: item.currentTaskList[0].taskId,
-      },
-    })
-    console.log('能力申请修改=================》', item)
-    window.open(newpage.href, '_self')
-  }
-}
-
-const initNum = () => {
-  if (numFlag.value) {
-    num.value = []
-    getMyProcessInstancePage({
-      page: 1,
-      limit: 4,
-      ended: 'false',
-      processDefinitionKey: processDefinitionKey.value,
-    }).then((res) => {
-      if (res.data.code == 0) {
-        num.value.unfinished = res.data.data.total
-        getMyProcessInstancePage({
-          page: 1,
-          limit: 4,
-          ended: 'true',
-          processDefinitionKey: processDefinitionKey.value,
-        }).then((res) => {
+    } else if (typeName.value == '设备申请') {
+      getDeviceDetailInfo(item.deviceId)
+        .then((res) => {
           if (res.data.code == 0) {
-            num.value.finished = res.data.data.total
-            numFlag.value = false
+            refObj.value = res.data.data
+            detailsVisible.value = true
           }
         })
-      }
-    })
+        .catch((err) => {})
+    } else if (
+      Object.keys(typeStrObj).includes(typeName.value) ||
+      typeName.value == '能力评价'
+    ) {
+      refObj.value = item
+      detailsVisible.value = true
+      processDefinitionName.value = item.processDefinitionName
+      businessKey.value = item.businessKey
+      processInstanceId.value = item.processInstanceId
+      resourceId.value = item.resourceId
+    } else {
+      message.error('数据请求失败！')
+    }
   }
-}
-const initNum2 = () => {
-  if (numFlag.value) {
-    num.value = []
-    getTabilityapplication({
-      page: 1,
-      limit: 4,
-      ended: 'false',
-    }).then((res) => {
-      if (res.data.code == 0) {
-        num.value.unfinished = res.data.data.total
-        getTabilityapplication({
-          page: 1,
-          limit: 4,
-          ended: 'true',
-        }).then((res) => {
-          if (res.data.code == 0) {
-            num.value.finished = res.data.data.total
-            numFlag.value = false
-          }
-        })
-      }
+  const showVideoList = (item) => {
+    console.log('显示列表', item)
+    getApplyCameraList(item.processInstanceId).then((res) => {
+      console.log('res', res)
+      xVideoList.value = []
+      res.data.data.map((val) => {
+        xVideoList.value.push({ name: val.channelName, key: val.channelId })
+      })
     })
+    videoVisible.value = true
+  }
+  const copyComment = (data) => {
+    let url = data
+    let oInput = document.createElement('input')
+    oInput.value = url
+    document.body.appendChild(oInput)
+    oInput.select() // 选择对象;
+    console.log(oInput.value)
+    document.execCommand('Copy') // 执行浏览器复制命令
+    message.success('复制成功')
+    oInput.remove()
+  }
+  const showAdd = (item) => {
+    if (item.processDefinitionKey == 'resourcemountapply') {
+      const data = {
+        id: item.resourceId,
+        taskId: item.currentTaskList[0].taskId,
+      }
+      if (item.dto.type == '组件服务') {
+        data.abilityToType = '组件服务'
+        data.componentTypeValue = item.dto.infoList.filter(
+          (val) => val.attrType == '组件类型'
+        )[0].attrValue
+      } else if (item.dto.type == '应用资源') {
+        data.abilityToType = '应用资源'
+      }
+      const newpage = router.resolve({
+        path: '/nenglishangjia', // 跳转的页面路由
+        query: data,
+      })
+      console.log('上架申请修改=================》', item)
+      window.open(newpage.href, '_blank')
+    } else if (item.processDefinitionKey == 'resourcundercarriageapply') {
+      selectOne(item.resourceId).then((res) => {
+        if (res.data.code == 0) {
+          delObj.value = res.data.data
+          reason.value = delObj.value.undercarriageReason
+          taskId.value = item.currentTaskList[0].taskId
+          visible.value = true
+          console.log('下架申请修改=================》', res.data.data)
+        }
+      })
+    } else if (item.processDefinitionKey == 'abilitydemandapply') {
+      const newpage = router.resolve({
+        path: '/addApplication', // 跳转的页面路由
+        query: {
+          id: item.businessKey,
+          taskId: item.currentTaskList[0].taskId,
+        },
+      })
+      console.log('需求申请修改=================》', item)
+      window.open(newpage.href, '_blank')
+    } else if (item.processDefinitionKey == 'abilityprocess') {
+      const newpage = router.resolve({
+        path: '/apply', // 跳转的页面路由
+        query: {
+          id: item.businessKey,
+          resourceId: item.resourceId,
+          name: item.name,
+          taskId: item.currentTaskList[0].taskId,
+        },
+      })
+      console.log('能力申请修改=================》', item)
+      window.open(newpage.href, '_self')
+    }
   }
-}
-// initNum()
 
-// 搜索框
-const onSearch = (name) => {
-  console.log(name.value)
-}
-//重置
-function replacement() {
-  name.value = ''
-  getApplyList(name.value)
-}
-const getApplyList = () => {
-  const params = {
-    page: page.value,
-    limit: 4,
-    ended: ended.value,
-    // name: name.value,
+  const initNum = () => {
+    if (numFlag.value) {
+      num.value = []
+      getMyProcessInstancePage({
+        page: 1,
+        limit: 4,
+        ended: 'false',
+        processDefinitionKey: processDefinitionKey.value,
+      }).then((res) => {
+        if (res.data.code == 0) {
+          num.value.unfinished = res.data.data.total
+          getMyProcessInstancePage({
+            page: 1,
+            limit: 4,
+            ended: 'true',
+            processDefinitionKey: processDefinitionKey.value,
+          }).then((res) => {
+            if (res.data.code == 0) {
+              num.value.finished = res.data.data.total
+              numFlag.value = false
+            }
+          })
+        }
+      })
+    }
   }
-  if (ended.value === '') {
-    delete params.ended
+  const initNum2 = () => {
+    if (numFlag.value) {
+      num.value = []
+      getTabilityapplication({
+        page: 1,
+        limit: 4,
+        ended: 'false',
+      }).then((res) => {
+        if (res.data.code == 0) {
+          num.value.unfinished = res.data.data.total
+          getTabilityapplication({
+            page: 1,
+            limit: 4,
+            ended: 'true',
+          }).then((res) => {
+            if (res.data.code == 0) {
+              num.value.finished = res.data.data.total
+              numFlag.value = false
+            }
+          })
+        }
+      })
+    }
   }
-  if (typeName.value == '能力申请') {
-    getTabilityapplication(params).then((res) => {
+  // initNum()
+
+  // 搜索框
+  const onSearch = (name) => {
+    console.log(name.value)
+  }
+  //重置
+  function replacement() {
+    name.value = ''
+    getApplyList(name.value)
+  }
+  const getApplyList = () => {
+    const params = {
+      page: page.value,
+      limit: 4,
+      ended: ended.value,
+      // name: name.value,
+    }
+    if (ended.value === '') {
+      delete params.ended
+    }
+    if (typeName.value == '能力申请') {
+      getTabilityapplication(params).then((res) => {
+        contentList.data = []
+        console.log('获取我的申请===============>', res.data.data)
+        contentList.data = res.data.data.list
+        total.value = res.data.data.total
+        showType.value = '能力申请'
+        initNum2()
+      })
+    } else if (typeName.value == '能力评价') {
       contentList.data = []
-      console.log('获取我的申请===============>', res.data.data)
-      contentList.data = res.data.data.list
-      total.value = res.data.data.total
-      showType.value = '能力申请'
-      initNum2()
-    })
-  } else if (typeName.value == '能力评价') {
-    contentList.data = []
-    num.value = []
-    showType.value = ''
-  } else if (typeName.value == '设备申请') {
-    let _state =
-      ended.value === ''
-        ? '全部'
-        : ended.value === true
+      num.value = []
+      showType.value = ''
+    } else if (typeName.value == '设备申请') {
+      let _state =
+        ended.value === ''
+          ? '全部'
+          : ended.value === true
           ? '审核完成'
           : '审核中'
-    getDeviceApply(_state)
-      .then((res) => {
-        if (res.data.code == 0) {
-          contentList.data = []
-          contentList.data = res.data.data.list || []
-          total.value = res.data.data.total
-          showType.value = '设备申请'
-          // 获取审核中，审核完成 数量
-          getDeviceNum()
-        }
-      })
-      .catch((err) => { })
-  } else if (Object.keys(typeStrObj).includes(typeName.value)) {
-    processDefinitionKey.value = typeStrObj[typeName.value]
-    params.processDefinitionKey = processDefinitionKey.value
-    getMyProcessInstancePage(params).then((res) => {
-      contentList.data = []
-      // initNum(name.value)
-      console.log(res.data.data.list)
-      contentList.data = res.data.data.list
-      total.value = res.data.data.total
-      initNum()
-      switch (typeIndex.value) {
-        case 2:
-          contentList.data.map((val) => {
-            nengliziyuanshangjiaapply(val.businessKey).then((res1) => {
-              console.log('上架===========>', res1.data.data)
-              val.title = res1.data.data.resourceDTO.name
-              val.dto = res1.data.data.resourceDTO
-              showType.value = '能力上架'
+      getDeviceApply(_state)
+        .then((res) => {
+          if (res.data.code == 0) {
+            contentList.data = []
+            contentList.data = res.data.data.list || []
+            total.value = res.data.data.total
+            showType.value = '设备申请'
+            // 获取审核中，审核完成 数量
+            getDeviceNum()
+          }
+        })
+        .catch((err) => {})
+    } else if (Object.keys(typeStrObj).includes(typeName.value)) {
+      processDefinitionKey.value = typeStrObj[typeName.value]
+      params.processDefinitionKey = processDefinitionKey.value
+      getMyProcessInstancePage(params).then((res) => {
+        contentList.data = []
+        // initNum(name.value)
+        console.log(res.data.data.list)
+        contentList.data = res.data.data.list
+        total.value = res.data.data.total
+        initNum()
+        switch (typeIndex.value) {
+          case 2:
+            contentList.data.map((val) => {
+              nengliziyuanshangjiaapply(val.businessKey).then((res1) => {
+                console.log('上架===========>', res1.data.data)
+                val.title = res1.data.data.resourceDTO.name
+                val.dto = res1.data.data.resourceDTO
+                showType.value = '能力上架'
+              })
             })
-          })
-          break
-        case 3:
-          contentList.data.map((val) => {
-            selectOneDel(val.businessKey).then((res1) => {
-              console.log('下架===========>', res1.data.data)
-              val.title = res1.data.data.name
-              val.dto = res1.data.data
-              showType.value = '能力下架'
+            break
+          case 3:
+            contentList.data.map((val) => {
+              selectOneDel(val.businessKey).then((res1) => {
+                console.log('下架===========>', res1.data.data)
+                val.title = res1.data.data.name
+                val.dto = res1.data.data
+                showType.value = '能力下架'
+              })
             })
-          })
-          break
-        case 4:
-          contentList.data.map((val) => {
-            getDemandForm(val.businessKey).then((res1) => {
-              console.log('需求===========>', res1.data.data)
-              val.title = res1.data.data.demandSubject
-              val.resourceStatusTip = res1.data.data.flagTip
-              val.dto = res1.data.data
-              showType.value = '能力需求'
+            break
+          case 4:
+            contentList.data.map((val) => {
+              getDemandForm(val.businessKey).then((res1) => {
+                console.log('需求===========>', res1.data.data)
+                val.title = res1.data.data.demandSubject
+                val.resourceStatusTip = res1.data.data.flagTip
+                val.dto = res1.data.data
+                showType.value = '能力需求'
+              })
             })
-          })
-          break
-        case 5:
-          contentList.data.map((val) => {
-            demandComment(val.businessKey).then((res1) => {
-              console.log('评论===========>', res1.data.data)
-              val.title = res1.data.data.comment
-              val.resourceStatusTip = res1.data.data.delFlagTip
-              val.dto = res1.data.data
-              showType.value = '需求评论'
+            break
+          case 5:
+            contentList.data.map((val) => {
+              demandComment(val.businessKey).then((res1) => {
+                console.log('评论===========>', res1.data.data)
+                val.title = res1.data.data.comment
+                val.resourceStatusTip = res1.data.data.delFlagTip
+                val.dto = res1.data.data
+                showType.value = '需求评论'
+              })
             })
-          })
-          break
-      }
-    })
-  } else {
-    contentList.data = []
-    num.value = []
-    showType.value = ''
-  }
-}
-const handleCurrentChange = (val) => {
-  page.value = val
-  getApplyList()
-}
-
-const handlePageSizeChange = (val) => {
-  page.value = val
-  getApplyList()
-}
-
-const viewDetail = (processDefinitionName, id, ended, businessKey) => {
-  if (processDefinitionName == '能力申请流程') {
-    router.push({
-      path: '/details',
-      query: {
-        id: id,
-        ended: ended,
-      },
-    })
-  }
-  if (processDefinitionName == '能力资源上架') {
-    console.log('showDetail', id, businessKey, ended)
-    router.push({
-      path: '/details',
-      query: {
-        id: id,
-      },
-    })
-  }
-  if (processDefinitionName == '能力需求申请') {
-    router.push({
-      path: '/demandDetails',
-      query: {
-        id: businessKey,
-      },
-    })
-  }
-}
-
-// 下架能力
-const del = () => {
-  console.log('下架================》', delObj.value, reason.value)
-  delObj.value.undercarriageReason = reason.value
-  updateRes(delObj.value).then((upres) => {
-    if (upres.data.code == 0) {
-      relaunch({
-        data: { undercarriageReason: reason.value },
-        taskId: taskId.value,
-      }).then((res) => {
-        console.log('驳回================>', res)
-        if (res.data.code == 0) {
-          message.success('重新发起流程成功！')
-          visible.value = false
-          reason.value = ''
-        } else {
-          message.error('重新发起流程失败！')
+            break
         }
       })
     } else {
-      message.error('数据更新失败！')
+      contentList.data = []
+      num.value = []
+      showType.value = ''
+    }
+  }
+  const handleCurrentChange = (val) => {
+    page.value = val
+    getApplyList()
+  }
+
+  const handlePageSizeChange = (val) => {
+    page.value = val
+    getApplyList()
+  }
+
+  const viewDetail = (processDefinitionName, id, ended, businessKey) => {
+    if (processDefinitionName == '能力申请流程') {
+      router.push({
+        path: '/details',
+        query: {
+          id: id,
+          ended: ended,
+        },
+      })
+    }
+    if (processDefinitionName == '能力资源上架') {
+      console.log('showDetail', id, businessKey, ended)
+      router.push({
+        path: '/details',
+        query: {
+          id: id,
+        },
+      })
+    }
+    if (processDefinitionName == '能力需求申请') {
+      router.push({
+        path: '/demandDetails',
+        query: {
+          id: businessKey,
+        },
+      })
+    }
+  }
+
+  // 下架能力
+  const del = () => {
+    console.log('下架================》', delObj.value, reason.value)
+    delObj.value.undercarriageReason = reason.value
+    updateRes(delObj.value).then((upres) => {
+      if (upres.data.code == 0) {
+        relaunch({
+          data: { undercarriageReason: reason.value },
+          taskId: taskId.value,
+        }).then((res) => {
+          console.log('驳回================>', res)
+          if (res.data.code == 0) {
+            message.success('重新发起流程成功！')
+            visible.value = false
+            reason.value = ''
+          } else {
+            message.error('重新发起流程失败！')
+          }
+        })
+      } else {
+        message.error('数据更新失败！')
+      }
+    })
+  }
+
+  // 西海岸：设备申请列表 todo
+  const getDeviceApply = (state) => {
+    return new Promise((resolve, reject) => {
+      let _data = {
+        page: page.value,
+        limit: 4,
+        state,
+      }
+      deviceApplylist(_data)
+        .then((res) => {
+          resolve(res)
+          console.log('res----设备申请-------->', res)
+        })
+        .catch((err) => {
+          reject(err)
+          console.log('err------------>', err)
+        })
+    })
+  }
+
+  // 西海岸：设备申请--查询详情
+  const getDeviceDetailInfo = (deviceId) => {
+    return new Promise((resolve, reject) => {
+      getDeviceDetail(deviceId)
+        .then((res) => {
+          resolve(res)
+          console.log('res----查询详情-------->', res)
+        })
+        .catch((err) => {
+          reject(err)
+          console.log('err------------>', err)
+        })
+    })
+  }
+
+  // 西海岸：设备申请-审核中, 审核完成数量
+  const getDeviceNum = () => {
+    if (!numFlag.value) {
+      return
+    }
+    num.value = []
+    Promise.all([getDeviceApply('审核中'), getDeviceApply('审核完成')])
+      .then((res) => {
+        console.log('res-----数量------->', res)
+        let unfinished = res[0] && res[0].data && res[0].data.data
+        let finished = res[1] && res[1].data && res[1].data.data
+        num.value.unfinished = unfinished.total || ''
+        num.value.finished = finished.total || ''
+        numFlag.value = false
+      })
+      .catch((err) => {})
+  }
+
+  const showPhoneModal = () => {
+    phoneVisible.value = true
+  }
+
+  mybus.on('closeModal', (obj) => {
+    detailsVisible.value = false
+    changeType(obj.type, obj.index)
+  })
+  onBeforeUnmount(() => {
+    mybus.off('closeModal')
+  })
+  onMounted(() => {
+    getApplyList()
+
+    if (props.tabTypeName) {
+      let _index = typeList.value.findIndex((v) => v == props.tabTypeName)
+      changeType(props.tabTypeName, _index != -1 ? _index : 0)
     }
   })
-}
-
-// 西海岸：设备申请列表 todo
-const getDeviceApply = (state) => {
-  return new Promise((resolve, reject) => {
-    let _data = {
-      page: page.value,
-      limit: 4,
-      state,
-    }
-    deviceApplylist(_data)
-      .then((res) => {
-        resolve(res)
-        console.log('res----设备申请-------->', res)
-      })
-      .catch((err) => {
-        reject(err)
-        console.log('err------------>', err)
-      })
-  })
-}
-
-// 西海岸：设备申请--查询详情
-const getDeviceDetailInfo = (deviceId) => {
-  return new Promise((resolve, reject) => {
-    getDeviceDetail(deviceId)
-      .then((res) => {
-        resolve(res)
-        console.log('res----查询详情-------->', res)
-      })
-      .catch((err) => {
-        reject(err)
-        console.log('err------------>', err)
-      })
-  })
-}
-
-// 西海岸：设备申请-审核中, 审核完成数量
-const getDeviceNum = () => {
-  if (!numFlag.value) {
-    return
-  }
-  num.value = []
-  Promise.all([getDeviceApply('审核中'), getDeviceApply('审核完成')])
-    .then((res) => {
-      console.log('res-----数量------->', res)
-      let unfinished = res[0] && res[0].data && res[0].data.data
-      let finished = res[1] && res[1].data && res[1].data.data
-      num.value.unfinished = unfinished.total || ''
-      num.value.finished = finished.total || ''
-      numFlag.value = false
-    })
-    .catch((err) => {
-    })
-}
-
-
-const showPhoneModal = () => {
-  phoneVisible.value = true
-}
-
-mybus.on('closeModal', (obj) => {
-  detailsVisible.value = false
-  changeType(obj.type, obj.index)
-})
-onBeforeUnmount(() => {
-  mybus.off('closeModal')
-})
-onMounted(() => {
-  getApplyList()
-
-  if (props.tabTypeName) {
-    let _index = typeList.value.findIndex(v => v == props.tabTypeName)
-    changeType(props.tabTypeName, _index != -1 ? _index : 0)
-  }
-})
 </script>
 
 <style scoped lang="less">
-.on-the-right-side-of-the-list {
-  background: #ffffff;
-  padding: 20px 0px 30px 20px;
-  position: absolute;
-  width: 1087px;
-  height: 810px;
-  top: 0px;
-  display: flex;
-  margin-top: 20px;
-  flex-direction: column;
-  font-size: 16px;
-  justify-content: left;
+  .on-the-right-side-of-the-list {
+    background: #ffffff;
+    padding: 20px 0px 30px 20px;
+    position: absolute;
+    width: 1087px;
+    height: 810px;
+    top: 0px;
+    display: flex;
+    margin-top: 20px;
+    flex-direction: column;
+    font-size: 16px;
+    justify-content: left;
 
-  .title {
-    font-size: 20px;
-    color: #000000;
-    font-family: 'Alibaba PuHuiTi';
-    font-weight: 500;
-  }
-
-  .sousuokuang {
-    margin: 20px 0px 21px 0px;
-
-    .ant-input-search {
-      max-width: 490px;
+    .title {
+      font-size: 20px;
+      color: #000000;
+      font-family: 'Alibaba PuHuiTi';
+      font-weight: 500;
     }
 
-    :deep(.ant-input) {
-      width: 400px;
-      height: 36px;
-      font-size: 14px;
-      color: #b2b2b2;
-      background: #f5f5f5;
-    }
+    .sousuokuang {
+      margin: 20px 0px 21px 0px;
 
-    :deep(.ant-input-group-addon) {
-      display: inline-block;
-      margin-left: 10px;
+      .ant-input-search {
+        max-width: 490px;
+      }
 
-      .ant-input-search-button {
-        width: 80px;
+      :deep(.ant-input) {
+        width: 400px;
         height: 36px;
-        border-radius: 4px;
         font-size: 14px;
+        color: #b2b2b2;
+        background: #f5f5f5;
+      }
+
+      :deep(.ant-input-group-addon) {
+        display: inline-block;
+        margin-left: 10px;
+
+        .ant-input-search-button {
+          width: 80px;
+          height: 36px;
+          border-radius: 4px;
+          font-size: 14px;
+        }
       }
     }
-  }
 
-  .tab {
-    display: flex;
-    font-size: 14px;
-    color: #999999;
+    .tab {
+      display: flex;
+      font-size: 14px;
+      color: #999999;
 
-    div {
-      // width: 70px;
-      padding: 5px 10px;
-      height: 24px;
-      line-height: 14px;
-      border: 1px solid #cccccc;
-      border-radius: 12px;
-      margin-left: 10px;
+      div {
+        // width: 70px;
+        padding: 5px 10px;
+        height: 24px;
+        line-height: 14px;
+        border: 1px solid #cccccc;
+        border-radius: 12px;
+        margin-left: 10px;
+        text-align: center;
+        color: #666666;
+        cursor: pointer;
+      }
+
+      .tabclass {
+        border: 1px solid #0087ff;
+        color: #0087ff;
+      }
+    }
+
+    .content {
+      padding-right: 10px;
+      height: 510px;
+
+      .content-body {
+        padding-bottom: 20px;
+        padding-top: 20px;
+        margin-right: 10px;
+        height: 150px;
+        border-bottom: #cccccc 1px solid;
+        position: relative;
+
+        .content-body-title {
+          min-width: 100px;
+          max-width: 900px;
+          width: fit-content;
+          font-size: 14px;
+          color: #333333;
+          font-family: 'Alibaba PuHuiTi';
+          font-weight: 500;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+
+        .content-body-content {
+          margin-top: 10px;
+          margin-bottom: 10px;
+          margin-right: 40px;
+          /* width: 720px; */
+          display: inline-block;
+        }
+
+        .content-body-content-son {
+          line-height: 16px;
+          font-size: 12px;
+          width: 100%;
+          // text-overflow: -o-ellipsis-lastline;
+          // overflow: hidden;
+          // text-overflow: ellipsis;
+          // display: -webkit-box;
+          // -webkit-line-clamp: 3;
+          // -webkit-box-orient: vertical;
+          display: flex;
+          color: #999999;
+
+          span {
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-line-clamp: 1;
+            -webkit-box-orient: vertical;
+            max-width: 8.1rem;
+            line-height: 24px;
+            word-break: break-all;
+          }
+        }
+
+        .content-body-bottom {
+          display: flex;
+          color: #cccccc;
+          font-size: 12px;
+
+          div:first-child {
+            margin-right: 30px;
+          }
+        }
+      }
+    }
+
+    .bottom {
+      position: absolute;
+      bottom: 30px;
+      right: 20px;
+    }
+
+    .button-box {
+      position: absolute;
+      right: 20px;
+      top: 10px;
+      display: flex;
+      flex-direction: column;
+    }
+
+    .button {
+      width: 96px;
+      height: 30px;
+      margin: 5px 0;
+      background: #0087ff;
+      font-size: 14px;
+      color: #fff;
+      border-radius: 4px;
       text-align: center;
-      color: #666666;
+      line-height: 30px;
       cursor: pointer;
     }
 
-    .tabclass {
-      border: 1px solid #0087ff;
-      color: #0087ff;
+    .buttonAgree {
+      background-color: #49c988;
+    }
+
+    .backToFirst {
+      background-color: rgb(214, 91, 91);
     }
   }
 
-  .content {
-    padding-right: 10px;
-    height: 510px;
-
-    .content-body {
-      padding-bottom: 20px;
-      padding-top: 20px;
-      margin-right: 10px;
-      height: 150px;
-      border-bottom: #cccccc 1px solid;
-      position: relative;
-
-      .content-body-title {
-        min-width: 100px;
-        max-width: 900px;
-        width: fit-content;
-        font-size: 14px;
-        color: #333333;
-        font-family: 'Alibaba PuHuiTi';
-        font-weight: 500;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-
-      .content-body-content {
-        margin-top: 10px;
-        margin-bottom: 10px;
-        margin-right: 40px;
-        /* width: 720px; */
-        display: inline-block;
-      }
-
-      .content-body-content-son {
-        line-height: 16px;
-        font-size: 12px;
-        width: 100%;
-        // text-overflow: -o-ellipsis-lastline;
-        // overflow: hidden;
-        // text-overflow: ellipsis;
-        // display: -webkit-box;
-        // -webkit-line-clamp: 3;
-        // -webkit-box-orient: vertical;
-        display: flex;
-        color: #999999;
-
-        span {
-          overflow: hidden;
-          text-overflow: ellipsis;
-          display: -webkit-box;
-          -webkit-line-clamp: 1;
-          -webkit-box-orient: vertical;
-          max-width: 8.1rem;
-          line-height: 24px;
-          word-break: break-all;
-        }
-      }
-
-      .content-body-bottom {
-        display: flex;
-        color: #cccccc;
-        font-size: 12px;
-
-        div:first-child {
-          margin-right: 30px;
-        }
-      }
-    }
+  :deep(.ant-badge-count) {
+    top: -5px;
+    right: -10px;
   }
-
-  .bottom {
-    position: absolute;
-    bottom: 30px;
-    right: 20px;
-  }
-
-  .button-box {
-    position: absolute;
-    right: 20px;
-    top: 10px;
-    display: flex;
-    flex-direction: column;
-  }
-
-  .button {
-    width: 96px;
-    height: 30px;
-    margin: 5px 0;
-    background: #0087ff;
-    font-size: 14px;
-    color: #fff;
-    border-radius: 4px;
-    text-align: center;
-    line-height: 30px;
-    cursor: pointer;
-  }
-
-  .buttonAgree {
-    background-color: #49c988;
-  }
-
-  .backToFirst {
-    background-color: rgb(214, 91, 91);
-  }
-}
-
-:deep(.ant-badge-count) {
-  top: -5px;
-  right: -10px;
-}
 </style>
diff --git a/front/src/views/personalCenter/components/PurchaseVehicle.vue b/front/src/views/personalCenter/components/PurchaseVehicle.vue
index 46e032f6..2c6cb06f 100644
--- a/front/src/views/personalCenter/components/PurchaseVehicle.vue
+++ b/front/src/views/personalCenter/components/PurchaseVehicle.vue
@@ -650,17 +650,19 @@ const ceshiFunction = () => {
 }
 // delOne delList handleDelete
 const handleDelete = (item, index) => {
+  console.log('item, index------------>', item, index);
+  
   console.log('item------------>', item);
   let delArr = [];
   // 单个删除
-  if (item) {
+  if (index) {
     delArr = [item.id]
   } else {
     // 批量删除
     if (checkedListAbility.value.length == 0) {
       return message.warning('请先选择需要操作的数据！')
     } else {
-      delArr = checkedListAbility.value.map(v=>v.id)
+      delArr = checkedListAbility.value
     }
   }
   sgcDel({
diff --git a/front/src/views/personalCenter/components/asideMenu.vue b/front/src/views/personalCenter/components/asideMenu.vue
index 46aef41e..d6a6a822 100644
--- a/front/src/views/personalCenter/components/asideMenu.vue
+++ b/front/src/views/personalCenter/components/asideMenu.vue
@@ -85,19 +85,15 @@ export default defineComponent({
     }
 
     onMounted(() => {
-      if (itShowXiHaiAn) {
-        handleClick(menuList[0])
+      if (type) {
+        console.log('type---------->', type)
+        let _obj = menuList.find(v => v.key == type)
+        handleClick(_obj)
       } else {
-        if (type) {
-          console.log('type---------->', type)
-          let _obj = menuList.find(v => v.key == type)
-          handleClick(_obj)
+        if (menuList[1]) {
+          handleClick(menuList[1])
         } else {
-          if (menuList[1]) {
-            handleClick(menuList[1])
-          }else {
-            handleClick(menuList[0])
-          }
+          handleClick(menuList[0])
         }
       }
     })