From ed6a7e85b238737d27c6c5c0f0a89e6fabd749a9 Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Fri, 28 Oct 2022 13:59:44 +0800
Subject: [PATCH 01/16] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/apply.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index 688ed0ed..0f99b1cd 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -103,7 +103,7 @@
                   </a-select>
                 </a-form-item>
               </div>
-              <div class="base-info" v-show="flag">
+              <div class="base-info" v-if="flag">
                 <div style="margin-bottom: 24px">
                   <a-form-item
                     style="margin-bottom: 0"

From 43bc0dd992438b96737b27407b84de36da6cafe1 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Fri, 28 Oct 2022 14:57:23 +0800
Subject: [PATCH 02/16] =?UTF-8?q?=E6=88=91=E7=9A=84=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=97=A5=E6=9C=9F=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/abilityStatistics/index.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue
index ac6bb284..8c544ba2 100644
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@@ -26,7 +26,7 @@
         <!--起始日期 @keyup.enter.native="getDataList()"-->
         <el-form-item>
           <span>日期：</span>
-          <el-date-picker v-model="value1" type="datetimerange" range-separator="至" start-placeholder="开始日期"
+          <el-date-picker v-model="value1" type="daterange" range-separator="至" start-placeholder="开始日期"
             end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
           </el-date-picker>
         </el-form-item>
@@ -909,8 +909,10 @@ export default {
     // 点击查询按钮查询数据
     getDataList() {
       if (this.value1 && this.value1.length > 0) {
-        this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd')
-        this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd')
+        // this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd')
+        // this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd')
+        this.startDate = this.value1[0]
+        this.endDate = this.value1[1]
       } else {
         this.startDate = ''
         this.endDate = ''

From 7e6fb8417a64a9c851592169296caf4269ebf87a Mon Sep 17 00:00:00 2001
From: unknown <xiaoshangqing@Hisense.ad>
Date: Fri, 28 Oct 2022 15:25:03 +0800
Subject: [PATCH 03/16] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/i18n/zh-CN.js         |  6 +++---
 back/src/i18n/zh-TW.js         | 10 ++++++----
 back/src/views/main-navbar.vue |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/back/src/i18n/zh-CN.js b/back/src/i18n/zh-CN.js
index acefdd06..4e8b0e9a 100644
--- a/back/src/i18n/zh-CN.js
+++ b/back/src/i18n/zh-CN.js
@@ -3,8 +3,8 @@ const t = {}
 t.loading = '加载中...'
 
 t.brand = {}
-t.brand.lg = '能力管理中心'
-t.brand.mini = '一体化综合指挥'
+t.brand.lg = '通用服务平台'
+t.brand.mini = '城市云脑'
 
 t.add = '新增'
 t.delete = '删除'
@@ -576,4 +576,4 @@ t.infrastructure.street = '所在街道'
 t.infrastructure.department = '所属部门'
 t.infrastructure.associatedApplication = '关联应用'
 
-export default t
+export default t
\ No newline at end of file
diff --git a/back/src/i18n/zh-TW.js b/back/src/i18n/zh-TW.js
index 3e6f2cd5..55803337 100644
--- a/back/src/i18n/zh-TW.js
+++ b/back/src/i18n/zh-TW.js
@@ -3,8 +3,10 @@ const t = {}
 t.loading = '加載中...'
 
 t.brand = {}
-t.brand.lg = '能力管理中心'
-t.brand.mini = '一体化综合指挥'
+    // t.brand.lg = '能力管理中心'
+    // t.brand.mini = '一体化综合指挥'
+t.brand.lg = '通用服务平台'
+t.brand.mini = '城市云脑'
 
 t.add = '新增'
 t.delete = '刪除'
@@ -25,7 +27,7 @@ t.choose = '請選擇'
 t.fileName = '文件名'
 t.design = '在線設計'
 t.preview = '預覽'
-t.reset='重置'
+t.reset = '重置'
 
 t.prompt = {}
 t.prompt.title = '提示'
@@ -544,4 +546,4 @@ t.notice.new = '有新通知'
 t.notice.disconnect = '連接斷開'
 t.notice.disconnectMessage = 'WebSocket連接已斷開，請檢查網絡'
 
-export default t
+export default t
\ No newline at end of file
diff --git a/back/src/views/main-navbar.vue b/back/src/views/main-navbar.vue
index f624e6cd..0959e0bb 100644
--- a/back/src/views/main-navbar.vue
+++ b/back/src/views/main-navbar.vue
@@ -221,7 +221,7 @@ export default {
   .aui-navbar__header {
     width: 25%;
     .aui-navbar__brand {
-      margin-left: 20px;
+      margin-left: -30px;
       a {
         font-size: 22px;
         color: #ffffff;

From 6967b3f1da6ec762deac2fbf17e260c0e87081c6 Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Fri, 28 Oct 2022 16:37:48 +0800
Subject: [PATCH 04/16] =?UTF-8?q?1.=E5=AE=8C=E6=88=90=E8=83=BD=E5=8A=9B?=
 =?UTF-8?q?=E9=9B=86=E5=B8=82=EF=BC=9A=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD?=
 =?UTF-8?q?-=E4=BC=9A=E5=AE=A2=E5=8E=85=EF=BC=8C=E5=AD=97=E6=95=B0?=
 =?UTF-8?q?=E5=A4=AA=E5=A4=9A=E6=97=B6=EF=BC=8C=E5=B1=95=E7=A4=BA=E4=B8=8D?=
 =?UTF-8?q?=E7=BE=8E=E8=A7=82=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B=202.?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=9E=8D=E5=90=88=E6=9C=8D=E5=8A=A1=EF=BC=9A?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E6=A8=A1=E5=BC=8F=EF=BC=8C=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=97=B6=E9=97=B4=EF=BC=8C=E5=8F=AA=E8=83=BD?=
 =?UTF-8?q?=E6=8C=89=E7=85=A7=E6=AD=A3=E5=BA=8F=E6=8E=92=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E6=8C=89=E7=85=A7=E5=80=92=E5=BA=8F=E6=8E=92=E5=88=97?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B=203=E5=AE=8C=E6=88=90.?=
 =?UTF-8?q?=E8=9E=8D=E5=90=88=E6=9C=8D=E5=8A=A1=EF=BC=9A=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=EF=BC=8C=E7=82=B9=E5=87=BB=E6=94=B6=E8=97=8F?=
 =?UTF-8?q?=E9=87=8F=EF=BC=8C=E5=8F=AA=E8=83=BD=E6=8C=89=E7=85=A7=E6=AD=A3?=
 =?UTF-8?q?=E5=BA=8F=E6=8E=92=EF=BC=8C=E4=B8=8D=E8=83=BD=E6=8C=89=E7=85=A7?=
 =?UTF-8?q?=E5=80=92=E5=BA=8F=E6=8E=92=E5=88=97=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/integrationServiceOrder.vue    |    4 +-
 front/src/views/home/infrastructurePage.vue   | 3811 ++++++++---------
 2 files changed, 1904 insertions(+), 1911 deletions(-)

diff --git a/front/src/views/home/components/integrationServiceOrder.vue b/front/src/views/home/components/integrationServiceOrder.vue
index fc13a08c..48f9debf 100644
--- a/front/src/views/home/components/integrationServiceOrder.vue
+++ b/front/src/views/home/components/integrationServiceOrder.vue
@@ -47,12 +47,10 @@ const integrationOrder = reactive({
 
 // 融合服务--排序
 const changeOrder = (i, val, type) => {
-  
-  console.log('i, val, type------------>', i, val, type);
   integrationOrder.orderField = val
   integrationOrder.orderType = type;
   // 0 apply_count ASC
-  let _index = integrationOrderList.value.findIndex(x => x.value = val)
+  let _index = integrationOrderList.value.findIndex(x => x.value == val)
   if (_index > -1) {
     integrationOrderList.value[_index].orderType = type
   }
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index ff73deae..270ed253 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -105,7 +105,13 @@
               <span>面积：{{ item.area }}m²</span>
             </div>
             <div class="bottonmContent">
-              {{ item.description }}
+              <a-tooltip>
+                <template #title>{{ item.description }}</template>
+                <span>{{ item.description }}</span>
+              </a-tooltip>
+              <!-- <a-tooltip>
+                {{ item.description }}
+              </a-tooltip>        -->
             </div>
           </div>
           <a-button
@@ -762,1291 +768,1237 @@
   </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, getEnkeUsers } from '@/api/home'
-  import { initiateMeet } from '@/api/file'
-  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'
-  import { useStore } from 'vuex'
-  const store = useStore()
-  const username = store.getters['user/username']
-  const props = defineProps({
-    // 模糊查
-    searchValue: { type: String, default: '' },
-    searchType: { type: String, default: '' },
+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, getEnkeUsers } from '@/api/home'
+import { initiateMeet } from '@/api/file'
+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'
+import { useStore } from 'vuex'
+const store = useStore()
+const username = store.getters['user/username']
+const props = defineProps({
+  // 模糊查
+  searchValue: { type: String, default: '' },
+  searchType: { 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 meetingList = ref([])
+const meetingPagination = ref({
+  total: 0,
+  current: 1,
+  pageSize: 5, //每页中显示5条数据
+  showSizeChanger: false,
+})
+const meetingSelect = reactive({ data: [] })
+const meetingSelectOld = reactive({ data: [] })
+const meetingOnSelectChange = (selectedRowKeys) => {
+  console.log('selectedRowKeys changed: ', selectedRowKeys, meetingSelect.data)
+  meetingSelect.data = selectedRowKeys
+  meetingSelectOld.data[meetingPagination.value.current - 1] =
+    meetingSelect.data
+}
+const videoList = ref([])
+const initMeeting = () => {
+  let str = '青岛市一网统揽项目组/'
+  // meetingSelect.data.map((val) => (str += val + '/'))
+  meetingSelectOld.data.map((val) => {
+    val.map((data) => (str += data + '/'))
   })
-  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',
-        ], //显示所有按钮,
+  initiateMeet(str).then((res) => {
+    console.log('组会=========>', res)
   })
-  const meetingList = ref([])
-  const meetingPagination = ref({
-    total: 0,
-    current: 1,
-    pageSize: 5, //每页中显示5条数据
-    showSizeChanger: false,
+}
+// 获取会议列表
+const meetingColumns = ref([
+  {
+    title: '视频会议用户名称',
+    dataIndex: 'hostName',
+    key: 'hostName',
+  },
+])
+const getMeetingList = () => {
+  getEnkeUsers({
+    page: meetingPagination.value.current,
+    limit: meetingPagination.value.pageSize,
+  }).then((res) => {
+    meetingList.value = []
+    res.data.data.list.map((val) => {
+      val.key = val.hostName
+    })
+    meetingList.value = res.data.data.list
+    meetingPagination.value.total = res.data.data.total
+    meetingSelect.data =
+      meetingSelectOld.data[meetingPagination.value.current - 1]
+    console.log('会议列表=============>', res.data.data)
   })
-  const meetingSelect = reactive({ data: [] })
-  const meetingSelectOld = reactive({ data: [] })
-  const meetingOnSelectChange = (selectedRowKeys) => {
-    console.log(
-      'selectedRowKeys changed: ',
-      selectedRowKeys,
-      meetingSelect.data
-    )
-    meetingSelect.data = selectedRowKeys
-    meetingSelectOld.data[meetingPagination.value.current - 1] =
-      meetingSelect.data
-  }
-  const videoList = ref([])
-  const initMeeting = () => {
-    let str = '青岛市一网统揽项目组/'
-    // meetingSelect.data.map((val) => (str += val + '/'))
-    meetingSelectOld.data.map((val) => {
-      val.map((data) => (str += data + '/'))
-    })
-    initiateMeet(str).then((res) => {
-      console.log('组会=========>', res)
-    })
-  }
-  // 获取会议列表
-  const meetingColumns = ref([
-    {
-      title: '视频会议用户名称',
-      dataIndex: 'hostName',
-      key: 'hostName',
-    },
-  ])
-  const getMeetingList = () => {
-    getEnkeUsers({
-      page: meetingPagination.value.current,
-      limit: meetingPagination.value.pageSize,
-    }).then((res) => {
-      meetingList.value = []
-      res.data.data.list.map((val) => {
-        val.key = val.hostName
-      })
-      meetingList.value = res.data.data.list
-      meetingPagination.value.total = res.data.data.total
-      meetingSelect.data =
-        meetingSelectOld.data[meetingPagination.value.current - 1]
-      console.log('会议列表=============>', res.data.data)
-    })
-  }
-  const hys = ref(require('@/assets/home/hys.png'))
+}
+const hys = ref(require('@/assets/home/hys.png'))
+getMeetingList()
+const handleMeeting = (pag, filters, sorter) => {
+  console.log(pag, filters, sorter)
+  meetingPagination.value.current = pag.current
   getMeetingList()
-  const handleMeeting = (pag, filters, sorter) => {
-    console.log(pag, filters, sorter)
-    meetingPagination.value.current = pag.current
-    getMeetingList()
-  }
-  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({})
+}
+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
-  }
-  if (props.searchType) {
-    tabClick(0, props.searchType.value)
-  }
-  // 消息列表页面
-  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()
+// console.log('模糊查传递', props.searchValue)
+if (props.searchValue) {
+  mapSearchParam.value.cameraName = props.searchValue
+}
+if (props.searchType) {
+  tabClick(0, props.searchType.value)
+}
+// 消息列表页面
+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 (isXiHaiAn) {
-        if (facilitiesType) {
-          tabClick(0, facilitiesType)
-        } else {
-          let _obj = {
-            title: '视频标签',
-            content: ['视频资源'],
-          }
-          clickList.value.push(_obj)
-          tabClick(0, '视频资源')
-        }
+      // 默认选中
+      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
+      ? ['视频资源']
+      : username == 'admin'
+      ? ['政务云资源', '视频资源', '城市云脑会客厅', '视频会议']
+      : ['政务云资源', '视频资源', '城市云脑会客厅'],
+  },
+])
+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) => {
+  debugger
+  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) => {
+  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 == '城市云脑会客厅') {
+    } 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 = '视频会议'
+    }
+    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 = 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 = []
+      }
+      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 == '视频会议' || name == '感知资源') {
+    dataSource.value = []
+    dataSource2.value = []
+    console.log('视频会议=========>', dataSource, columns)
+    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
-        ? ['视频资源']
-        : username == 'admin'
-        ? ['政务云资源', '视频资源', '城市云脑会客厅', '视频会议']
-        : ['政务云资源', '视频资源', '城市云脑会客厅'],
-    },
-  ])
-  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
+    case '视频会议':
+      initMeeting()
+      break
+    default:
+      break
   }
-
-  // 单个预览，当前点击数据
-  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 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) => {
-    debugger
-    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) => {
-    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 == '城市云脑会客厅') {
-      } 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 = '视频会议'
-      }
-      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 = 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 = []
-        }
-        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 == '视频会议' || name == '感知资源') {
-      dataSource.value = []
-      dataSource2.value = []
-      console.log('视频会议=========>', dataSource, columns)
-      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
-      case '视频会议':
-        initMeeting()
-        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
@@ -2057,478 +2009,381 @@
           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)
+    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)
+      })
   }
-  const onSelectChange2 = (
+}
+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 onSelectChange2 = (record, selected, selectedRows, nativeEvent, type) => {
+  console.log(
+    '已选中======================>',
     record,
     selected,
     selectedRows,
     nativeEvent,
     type
-  ) => {
-    console.log(
-      '已选中======================>',
-      record,
-      selected,
-      selectedRows,
-      nativeEvent,
-      type
-    )
-    if (selected) {
-      selectedRowKeys.value.push(record.name)
-      selectedRows.value.push(record.name)
-    } else {
-      selectedRowKeys.value.splice(
-        selectedRowKeys.value.indexOf(record.name),
-        1
-      )
-      selectedRows.value.splice(selectedRowKeys.value.indexOf(record.name), 1)
-    }
+  )
+  if (selected) {
+    selectedRowKeys.value.push(record.name)
+    selectedRows.value.push(record.name)
+  } else {
+    selectedRowKeys.value.splice(selectedRowKeys.value.indexOf(record.name), 1)
+    selectedRows.value.splice(selectedRowKeys.value.indexOf(record.name), 1)
   }
-  const onSelectAll = (selected, selectedRows, changeRows) => {
-    if (selected) {
+}
+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.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
-          )
+        selectedList.value.forEach((ele, index) => {
+          if (ele.channelCode == record.channelCode) {
+            selectedList.value.splice(index, 1)
+          }
         })
-      }
-    } 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)
+  } 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
+      )
+    })
   }
-  const onSelectAll2 = (selected, selectedRows, changeRows) => {
-    console.log(selected, selectedRows, changeRows)
-    if (selected) {
-    } else {
-    }
+  console.log('heiheiheiehiehei', selected, selectedRows, changeRows)
+  mybus.emit('selectTablePoint', selectedList.value)
+}
+const onSelectAll2 = (selected, selectedRows, changeRows) => {
+  console.log(selected, selectedRows, changeRows)
+  if (selected) {
+  } else {
   }
+}
 
-  // 切换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;
@@ -2545,291 +2400,431 @@
             width: 0.8rem;
             height: 0.36rem;
             background: #0558e1;
-            border-radius: 0.06rem;
+            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;
+      // }
+      :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;
-        }
-      }
-    }
-
-    .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-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%;
+      }
     }
 
-    :deep(.ant-pagination) {
-      float: right;
-    }
+    .rightContent {
+      height: 1.75rem;
+      width: 5.8rem;
 
-    :deep(.ant-pagination) {
-      text-align: end;
+      .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;
+      }
+      .bottonmContent {
+        width: 100%;
+        overflow: hidden; //超出隐藏
+        text-overflow: ellipsis; //超出文本设置为...
+        display: -webkit-box; //将div1转换为盒子模型
+        -webkit-line-clamp: 3; //设置div1的文本为2行
+        -webkit-box-orient: vertical; //从顶部向底部垂直布置子元素
+      }
     }
   }
-  :deep(.ant-table-thead > tr > th) {
-    color: #5580f7 !important;
-    font-size: 16px !important;
-    font-weight: 600 !important;
+
+  :deep(.ant-pagination) {
+    float: right;
   }
+
+  :deep(.ant-pagination) {
+    text-align: end;
+  }
+}
+:deep(.ant-table-thead > tr > th) {
+  color: #5580f7 !important;
+  font-size: 16px !important;
+  font-weight: 600 !important;
+}
 </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;
+}
 
-  .disabled-text {
-    cursor: not-allowed;
-    opacity: 0.5;
+// 左下
+.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;
-
-    &:hover {
-      color: #666666;
-    }
   }
+}
 </style>

From 2774650d96f1248b04703b93fe46c4e71ebd8803 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Fri, 28 Oct 2022 17:04:37 +0800
Subject: [PATCH 05/16] =?UTF-8?q?=E6=96=B0=E6=89=8B=E6=8C=87=E5=8D=97--?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E4=B8=8B=E6=9E=B6=E8=B7=B3=E8=BD=AC=E5=88=B0?=
 =?UTF-8?q?=E6=88=91=E7=9A=84=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/instructionManual/components/menuBook.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/front/src/views/instructionManual/components/menuBook.vue b/front/src/views/instructionManual/components/menuBook.vue
index 82412857..d27eb5fe 100644
--- a/front/src/views/instructionManual/components/menuBook.vue
+++ b/front/src/views/instructionManual/components/menuBook.vue
@@ -267,12 +267,10 @@
       })
       window.open(newpage.href, '_blank')
     } else if (data === '资源下架') {
-      window.sessionStorage.setItem('type', JSON.stringify('apply'))
+      // 跳转到个人中心--我的发布
+      window.sessionStorage.setItem('type', JSON.stringify('push'))
       const newpage = router.resolve({
         path: '/personalCenter',
-        query: {
-          tabTypeName: '能力上架'
-        }
       })
       window.location.href = newpage.href
     }

From 7e53463eaf03d81d6e90c638360d6d08f7a83efa Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Sat, 29 Oct 2022 16:26:39 +0800
Subject: [PATCH 06/16] =?UTF-8?q?=E4=B8=89=E4=B8=AA=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/router/index.js                      |   2 -
 .../views/modules/ability/shipinziyuan.vue    | 356 ++++++++++
 .../src/views/modules/ability/shujuziyuan.vue | 384 ++++++++++
 back/src/views/modules/ability/yunandwang.vue | 662 ++++++++++++++++++
 4 files changed, 1402 insertions(+), 2 deletions(-)
 create mode 100644 back/src/views/modules/ability/shipinziyuan.vue
 create mode 100644 back/src/views/modules/ability/shujuziyuan.vue
 create mode 100644 back/src/views/modules/ability/yunandwang.vue

diff --git a/back/src/router/index.js b/back/src/router/index.js
index 299a5852..6945f87b 100644
--- a/back/src/router/index.js
+++ b/back/src/router/index.js
@@ -105,7 +105,6 @@ router.beforeEach((to, from, next) => {
       return next({ name: 'login' })
     }
     window.SITE_CONFIG.menuList = res.data.filter(item => item.site === 0)
-    debugger
     fnAddDynamicMenuRoutes(window.SITE_CONFIG.menuList)
     next({ ...to, replace: true })
   }).catch(() => {
@@ -138,7 +137,6 @@ function fnCurrentRouteIsPageRoute (route, pageRoutes = []) {
  */
 function fnAddDynamicMenuRoutes (menuList = [], routes = []) {
   var temp = []
-  debugger
   for (var i = 0; i < menuList.length; i++) {
     if (menuList[i].children && menuList[i].children.length >= 1) {
       temp = temp.concat(menuList[i].children)
diff --git a/back/src/views/modules/ability/shipinziyuan.vue b/back/src/views/modules/ability/shipinziyuan.vue
new file mode 100644
index 00000000..3e2d31dc
--- /dev/null
+++ b/back/src/views/modules/ability/shipinziyuan.vue
@@ -0,0 +1,356 @@
+<template>
+  <div>
+    <div  class="mod-ability__bsabilityai">
+      <el-form :inline="true" :model="dataForm">
+        <el-form-item label="资源名称">
+          <el-input
+            v-model="dataForm.name"
+            placeholder="请输入资源名称"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="query(dataForm.name)">{{
+            $t("query")
+          }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="reset">重置</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="yunadd('add',null)"
+            >上架</el-button
+          >
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            v-if="$hasPermission('ability:bsabilityai:delete')"
+            type="danger"
+            @click="reset"
+            >{{ $t('deleteBatch') }}</el-button
+          >
+        </el-form-item>
+      </el-form>
+      <el-table
+        :data="dataList1"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        style="width: 100%"
+        height="650px"
+      >
+        <el-table-column
+          prop="a"
+          label="摄像头名称"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="b"
+          label="摄像头编号"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="c"
+          label="位置"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="d"
+          label="提供部门"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="e"
+          label="提供地市"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        
+        <el-table-column
+          label="操作"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="yunadd('detail',scope.row)"
+              >详情</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="yunadd('update',scope.row)"
+              >修改</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="reset"
+              >删除</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="reset"
+              >设置标签</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="Number(10)"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+    </div>
+ 
+    <!--新增-->
+    <el-dialog title="视频资源" :visible.sync="yunshow" width="720px" class="status_change">
+      <el-form :inline="true" label-width="120px">
+        <div class="form-minwidth-style">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="摄像头名称：">
+                <el-input v-model="yunaddForm.a"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="摄像头编号：">
+                <el-input v-model="yunaddForm.b"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="位置：">
+                <el-input v-model="yunaddForm.a"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="提供部门：">
+                <el-input v-model="yunaddForm.b"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="提供地市：">
+                <el-input v-model="yunaddForm.d"></el-input>
+              </el-form-item>
+            </el-col>
+            
+          </el-row>
+         
+          <div slot="footer" class="dialog-footer">
+            <el-button @click="yunshow = false">取 消</el-button>
+            <el-button type="primary" @click="yunshow = false">确 定</el-button>
+          </div>
+        </div>
+      </el-form>
+    </el-dialog>
+
+</div>
+</template>
+
+<script>
+import mixinViewModule from "@/mixins/view-module";
+
+export default {
+  mixins: [mixinViewModule],
+  data() {
+    return {
+      yunaddForm: {
+        a: "",
+        b: "",
+        c: "",
+        d: "",
+        e: "",
+        f: "",
+        g:"",
+        h:"",
+        i:"",
+        j:"",
+      },
+     
+      total: 10,
+      choose: 1,
+      yunshow: false,
+      wangshow:false,
+      dataList1: [ 
+        {
+            "a": "市北区顺昌路改造项目大门",
+            "b": "101_37020201581314000511",
+            "c": "市北区顺昌路",
+            "d": "市住房城乡建设局",
+            "e": "市南区"
+        },
+        {
+            "a": "青城建设蚌埠路以北宁乡路以西门",
+            "b": "101_37020201581314000514",
+            "c": "青城建设蚌埠路以北宁乡路",
+            "d": "市住房城乡建设局",
+            "e": "市南区"
+        },
+        {
+            "a": "青房建安幸福家园三期现场",
+            "b": "101_37020201581314000518",
+            "c": "青房建安幸福家园",
+            "d": "市住房城乡建设局",
+            "e": "市南区"
+        },
+        {
+            "a": "青岛一建青岛公共卫生中心大门",
+            "b": "101_37020201581314000519",
+             "c": "青岛一建青岛公共卫生中心",
+            "d": "市住房城乡建设局",
+            "e": "市南区"
+        },
+        {
+            "a": "中建筑港中国钢研院一钢一研塔吊",
+            "b": "101_37020201581314000529",
+             "c": "市北区顺昌路",
+            "d": "市住房城乡建设局",
+            "e": "市南区"
+        },
+        {
+            "a": "现场",
+            "b": "101_37020201581314001008",
+             "c": "市北区顺昌路",
+            "d": "市住房城乡建设局",
+            "e": "市南区"
+        },
+        {
+            "a": "高位1",
+            "b": "101_37020201581314001037",
+            "c": "市北区顺昌路",
+            "d": "市住房城乡建设局",
+            "e": "市南区"
+        },
+        {
+            "a": "门口洗车",
+            "b": "101_37020201581314001038",
+             "c": "市北区顺昌路",
+            "d": "市住房城乡建设局",
+            "e": "市南区"
+        },
+        {
+            "a": "大门口",
+            "b": "101_37020201581314001039",
+            "c": "市北区顺昌路",
+            "d": "市住房城乡建设局",
+            "e": "市南区"
+        },
+        {
+            "a": "中青建安隆德花园现场",
+            "b": "101_37020201581314001359",
+            "c": "市北区顺昌路",
+            "d": "市住房城乡建设局",
+            "e": "市南区"
+        }
+    ],
+      dataForm: {
+        name: "",
+      },
+    };
+  },
+  watch: {},
+  components: {},
+  created() {},
+  mounted() {},
+  methods: {
+    handleChose(index) {
+      this.choose = index;
+    },
+    reset() {},
+    query() {},
+    //云资源新增
+    yunadd(type,row) {
+      if(type=='add'){
+        this.yunaddForm.a="" 
+        this.yunaddForm.b=""
+        this.yunaddForm.c=""
+        this.yunaddForm.d=""
+        this.yunaddForm.e=""
+        this.yunaddForm.f=""
+        this.yunaddForm.g=""
+      }else{
+        this.yunaddForm.a=row.a
+        this.yunaddForm.b=row.b
+        this.yunaddForm.c=row.c
+        this.yunaddForm.d=row.d
+        this.yunaddForm.e=row.e
+        this.yunaddForm.f=row.f
+        this.yunaddForm.g=row.g
+      }
+      this.yunshow = true;
+    },
+   
+
+
+  },
+};
+</script>
+<style lang="scss" scoped>
+.status_change {
+  ::v-deep  .el-dialog__header{
+    background-color:#0058e1;
+    padding: 10px 10px 10px;
+    .el-dialog__title,.el-dialog__headerbtn i{
+      color: white;
+    }
+    
+  }
+  .dialog-footer{
+    text-align: center;
+  }
+}
+.form-minwidth-style {
+  width: 660px;
+}
+.second-title {
+  border-radius: 2px;
+  margin-top: 10px;
+  margin-bottom: 22px;
+  font-size: 18px;
+  cursor: pointer;
+  text-align: center;
+  background: #ebe5e5;
+  width: 200px;
+  height: 30px;
+  line-height: 30px;
+  display: table;
+}
+
+.departmentStyle {
+  display: table-cell;
+  width: 50%;
+  color: #fff;
+  background-color: #0058e1;
+  font-weight: bolder;
+}
+.departmentStyle1 {
+  display: table-cell;
+  width: 50%;
+}
+.el-tooltip__popper {
+  max-width: 50%;
+}
+// ::v-deep .el-table .cell {
+//   width: 200px;
+// }
+::v-deep .el-upload-list__item-name {
+  width: 400px;
+}
+</style>
diff --git a/back/src/views/modules/ability/shujuziyuan.vue b/back/src/views/modules/ability/shujuziyuan.vue
new file mode 100644
index 00000000..ca345074
--- /dev/null
+++ b/back/src/views/modules/ability/shujuziyuan.vue
@@ -0,0 +1,384 @@
+<template>
+  <div>
+    <div  class="mod-ability__bsabilityai">
+      <el-form :inline="true" :model="dataForm">
+        <el-form-item label="资源名称">
+          <el-input
+            v-model="dataForm.name"
+            placeholder="请输入资源名称"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="query(dataForm.name)">{{
+            $t("query")
+          }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="reset">重置</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="yunadd('add',null)"
+            >上架</el-button
+          >
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            v-if="$hasPermission('ability:bsabilityai:delete')"
+            type="danger"
+            @click="reset"
+            >{{ $t('deleteBatch') }}</el-button
+          >
+        </el-form-item>
+      </el-form>
+      <el-table
+        :data="dataList1"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        style="width: 100%"
+        height="650px"
+      >
+        <el-table-column
+          prop="a"
+          label="数据名称"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="b"
+          label="数据代码"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="c"
+          label="数据描述"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="d"
+          label="提供部门"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="e"
+          label="创建时间"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        
+        <el-table-column
+          label="操作"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="yunadd('detail',scope.row)"
+              >详情</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="yunadd('update',scope.row)"
+              >修改</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="reset"
+              >删除</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="reset"
+              >设置标签</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="Number(10)"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+    </div>
+ 
+    <!--新增-->
+    <el-dialog title="数据资源" :visible.sync="yunshow" width="720px" class="status_change">
+      <el-form :inline="true" label-width="120px">
+        <div class="form-minwidth-style">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="数据名称：">
+                <el-input v-model="yunaddForm.a"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="数据代码：">
+                <el-input v-model="yunaddForm.b"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="数据描述：">
+                <el-input v-model="yunaddForm.a"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="数据存储方式：">
+                <el-input v-model="yunaddForm.b"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="数据量：">
+                <el-input v-model="yunaddForm.d"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="提供方式：">
+                <el-input v-model="yunaddForm.e"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="服务地址：">
+                <el-input v-model="yunaddForm.f"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="提供部门：">
+                <el-input v-model="yunaddForm.g"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="联系人：">
+                <el-input v-model="yunaddForm.f"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="联系方式：">
+                <el-input v-model="yunaddForm.g"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div slot="footer" class="dialog-footer">
+            <el-button @click="yunshow = false">取 消</el-button>
+            <el-button type="primary" @click="yunshow = false">确 定</el-button>
+          </div>
+        </div>
+      </el-form>
+    </el-dialog>
+
+</div>
+</template>
+
+<script>
+import mixinViewModule from "@/mixins/view-module";
+
+export default {
+  mixins: [mixinViewModule],
+  data() {
+    return {
+      yunaddForm: {
+        a: "",
+        b: "",
+        c: "",
+        d: "",
+        e: "",
+        f: "",
+        g:"",
+        h:"",
+        i:"",
+        j:"",
+      },
+     
+      total: 10,
+      choose: 1,
+      yunshow: false,
+      wangshow:false,
+      dataList1: [
+        {
+            "a": "供水营业网点信息",
+            "b": "307013109015000204",
+            "c": "供水营业网点信息",
+            "d": "青岛西海岸新区城市管理局（区水务局）",
+            "e ": "2022-10-28"
+        },
+        {
+            "a": "新建体育公园、笼式场地",
+            "b": "307013100673000036",
+            "c": "新建体育公园、笼式场地",
+            "d": "青岛市体育局",
+            "e ": "2022-10-28"
+        },
+        {
+            "a": "西海岸新区供水领域自然人欠费信息",
+            "b": "307013109015000211",
+            "c": "西海岸新区供水领域自然人欠费信息",
+            "d": "青岛西海岸新区城市管理局（区水务局）",
+            "e ": "2022-10-28"
+        },
+        {
+            "a": "青岛西海岸新区交通运输局",
+            "b": "307013109071000108",
+            "c": "公交站点查询",
+            "d": "青岛西海岸新区交通运输局",
+            "e ": "2022-10-27"
+        },
+        {
+            "a": "全市主要经济指标",
+            "b": "307013107004000062",
+            "c": "胶州市国民经济分行业数据",
+            "d": "胶州市统计局",
+            "e ": "2022-10-13"
+        },
+        {
+            "a": "乡村之星信息",
+            "b": "307013100000000187",
+            "c": "乡村之星信息",
+            "d": "青岛市农业农村局",
+            "e ": "2022-10-13"
+        },
+        {
+            "a": "建设项目环境影响评价审批信息",
+            "b": "307013107777000033",
+            "c": "建设单位、建设项目、审批文号",
+            "d": "青岛市生态环境局胶州分局",
+            "e ": "2022-10-13"
+        },
+        {
+            "a": "新时代文明实践阵地信息表",
+            "b": "307013108760000022",
+            "c": "镇街、阵地名称、专管员、联系电话",
+            "d": "莱西市夏格庄镇人民政府",
+            "e ": "2022-09-29"
+        },
+        {
+            "a": "泊里镇非物质文化遗产信息",
+            "b": "307013109000000067",
+            "c": "泊里镇非物质文化遗产的名称、简介等信息",
+            "d": "青岛市黄岛区泊里镇人民政府",
+            "e ": "2022-10-11"
+        },
+        {
+            "a": "人才住房建设情况",
+            "b": "307013100482000025",
+            "c": "人才住房项目数量、人才住房房屋套数、人才住房面积、人才住房目标任务房屋套数、人才住房房屋总面积",
+            "d": "青岛市住房和城乡建设局",
+            "e ": "2022-09-18"
+        }
+    ],
+       
+      dataForm: {
+        name: "",
+      },
+    };
+  },
+  watch: {},
+  components: {},
+  created() {},
+  mounted() {},
+  methods: {
+    handleChose(index) {
+      this.choose = index;
+    },
+    reset() {},
+    query() {},
+    //云资源新增
+    yunadd(type,row) {
+      if(type=='add'){
+        this.yunaddForm.a="" 
+        this.yunaddForm.b=""
+        this.yunaddForm.c=""
+        this.yunaddForm.d=""
+        this.yunaddForm.e=""
+        this.yunaddForm.f=""
+        this.yunaddForm.g=""
+      }else{
+        this.yunaddForm.a=row.a
+        this.yunaddForm.b=row.b
+        this.yunaddForm.c=row.c
+        this.yunaddForm.d=row.d
+        this.yunaddForm.e=row.e
+        this.yunaddForm.f=row.f
+        this.yunaddForm.g=row.g
+      }
+      this.yunshow = true;
+    },
+   
+
+
+  },
+};
+</script>
+<style lang="scss" scoped>
+.status_change {
+  ::v-deep  .el-dialog__header{
+    background-color:#0058e1;
+    padding: 10px 10px 10px;
+    .el-dialog__title,.el-dialog__headerbtn i{
+      color: white;
+    }
+    
+  }
+  .dialog-footer{
+    text-align: center;
+  }
+}
+.form-minwidth-style {
+  width: 660px;
+}
+.second-title {
+  border-radius: 2px;
+  margin-top: 10px;
+  margin-bottom: 22px;
+  font-size: 18px;
+  cursor: pointer;
+  text-align: center;
+  background: #ebe5e5;
+  width: 200px;
+  height: 30px;
+  line-height: 30px;
+  display: table;
+}
+
+.departmentStyle {
+  display: table-cell;
+  width: 50%;
+  color: #fff;
+  background-color: #0058e1;
+  font-weight: bolder;
+}
+.departmentStyle1 {
+  display: table-cell;
+  width: 50%;
+}
+.el-tooltip__popper {
+  max-width: 50%;
+}
+// ::v-deep .el-table .cell {
+//   width: 200px;
+// }
+::v-deep .el-upload-list__item-name {
+  width: 400px;
+}
+</style>
diff --git a/back/src/views/modules/ability/yunandwang.vue b/back/src/views/modules/ability/yunandwang.vue
new file mode 100644
index 00000000..76138863
--- /dev/null
+++ b/back/src/views/modules/ability/yunandwang.vue
@@ -0,0 +1,662 @@
+<template>
+  <div>
+    <div class="second-title">
+      <div
+        style="margin-right: 30px"
+        :class="[choose === 1 ? 'departmentStyle' : 'departmentStyle1']"
+        @click="handleChose(1)"
+      >
+        云资源
+      </div>
+      <div
+        :class="[choose === 2 ? 'departmentStyle' : 'departmentStyle1']"
+        @click="handleChose(2)"
+      >
+        网络资源
+      </div>
+    </div>
+    <div v-if="choose === 1" class="mod-ability__bsabilityai">
+      <el-form :inline="true" :model="dataForm">
+        <el-form-item>
+          <el-input
+            v-model="dataForm.name"
+            placeholder="请输入资源名称"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="query(dataForm.name)">{{
+            $t("query")
+          }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="yunadd('add',null)">新增</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        :data="dataList1"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        style="width: 100%"
+        height="650px"
+      >
+        <el-table-column
+          prop="a"
+          label="项目名称"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="b"
+          label="主机名称"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="c"
+          label="用途"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="d"
+          label="网络区域"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="e"
+          label="配置"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="f"
+          label="系统盘"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="g"
+          label="数据盘"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          label="操作"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="yunadd('detail',scope.row)"
+              >详情</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="yunadd('update',scope.row)"
+              >修改</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="Number(10)"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+    </div>
+    <div v-if="choose === 2" class="mod-ability__bsabilityai">
+      <el-form :inline="true" :model="dataForm">
+        <el-form-item>
+          <el-input
+            v-model="dataForm.name"
+            placeholder="请输入资源名称"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="query(dataForm.name)">{{
+            $t("query")
+          }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="wangadd('add',null)"
+            >新增</el-button
+          >
+        </el-form-item>
+      </el-form>
+      <el-table
+        :data="dataList2"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        style="width: 100%"
+        height="650px"
+      >
+        <el-table-column
+          prop="a"
+          label="项目名称"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="b"
+          label="网络名称"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="c"
+          label="用途"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="d"
+          label="网络区域"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="e"
+          label="网络类型"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="f"
+          label="宽带峰值"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="g"
+          label="IP"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          label="操作"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="wangadd('detail',scope.row)"
+              >详情</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="wangadd('update',scope.row)"
+              >修改</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="Number(total)"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+    </div>
+
+    <!--云资源新增-->
+    <el-dialog title="云资源" :visible.sync="yunshow" width="640px" class="status_change">
+      <el-form :inline="true" label-width="100px">
+        <div class="form-minwidth-style">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="项目名称：">
+                <el-input v-model="yunaddForm.a"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="主机名称：">
+                <el-input v-model="yunaddForm.b"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="用途：">
+                <el-input v-model="yunaddForm.c"   style="width:490px;"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="网络区域：">
+                <el-input v-model="yunaddForm.d"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="配置：">
+                <el-input v-model="yunaddForm.e"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="网络盘：">
+                <el-input v-model="yunaddForm.f"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="数据盘：">
+                <el-input v-model="yunaddForm.g"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div slot="footer" class="dialog-footer">
+            <el-button @click="yunshow = false">取 消</el-button>
+            <el-button type="primary" @click="yunshow = false">确 定</el-button>
+          </div>
+        </div>
+      </el-form>
+    </el-dialog>
+
+ <!--网资源新增-->
+ <el-dialog title="网络资源" :visible.sync="wangshow" width="640px" class="status_change">
+      <el-form :inline="true" label-width="100px">
+        <div class="form-minwidth-style">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="项目名称：">
+                <el-input v-model="wangaddForm.a"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="网络名称：">
+                <el-input v-model="wangaddForm.b"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="用途：">
+                <el-input v-model="wangaddForm.c"   style="width:490px;"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="网络区域：">
+                <el-input v-model="wangaddForm.d"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="网络类型：">
+                <el-input v-model="wangaddForm.e"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="宽带峰值：">
+                <el-input v-model="wangaddForm.f"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="IP：">
+                <el-input v-model="wangaddForm.g"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div slot="footer" class="dialog-footer">
+            <el-button @click="yunshow = false">取 消</el-button>
+            <el-button type="primary" @click="yunshow = false">确 定</el-button>
+          </div>
+        </div>
+      </el-form>
+    </el-dialog>
+</div>
+</template>
+
+<script>
+import mixinViewModule from "@/mixins/view-module";
+
+export default {
+  mixins: [mixinViewModule],
+  data() {
+    return {
+      yunaddForm: {
+        a: "",
+        b: "",
+        c: "",
+        d: "",
+        e: "",
+        f: "",
+        g:"",
+      },
+      wangaddForm:{
+        a: "",
+        b: "",
+        c: "",
+        d: "",
+        e: "",
+        f: "",
+        g: "",
+      },
+      total: 10,
+      choose: 1,
+      yunshow: false,
+      wangshow:false,
+      dataList1: [
+      {
+            "a": "数字底座",
+            "b": "数字底座数据库服务器",
+            "c": "数据库服务器",
+            "d": "政务外网公共服务域",
+            "e": "CPU:8核；内存:15G",
+            "f": "50G",
+            "g": "150G"
+        },
+        {
+            "a": "数字底座",
+            "b": "数字底座应用服务器",
+            "c": "应用服务器",
+            "d": "政务外网公共服务域",
+            "e": "CPU:8核；内存:16G",
+            "f": "30G",
+            "g": "100G"
+        },
+        {
+            "a": "数字底座",
+            "b": "算法仓01服务器",
+            "c": "应用服务器",
+            "d": "政务外网公共服务域",
+            "e": "CPU:8核；内存:15G",
+            "f": "40G",
+            "g": "170G"
+        },
+        {
+            "a": "数字底座",
+            "b": "算法仓02服务器",
+            "c": "应用服务器",
+            "d": "政务外网公共服务域",
+            "e": "CPU:16核；内存:32G",
+            "f": "80G",
+            "g": "600G"
+        },
+        {
+            "a": "数字底座",
+            "b": "算法仓03服务器",
+            "c": "应用服务器",
+            "d": "政务外网公共服务域",
+            "e": "CPU:32核；内存:64G",
+            "f": "120G",
+            "g": "1024G"
+        },
+        {
+            "a": "应急一体化综合指挥平台",
+            "b": "一体化api服务器2",
+            "c": "应用服务器",
+            "d": "金宏网",
+            "e": "CPU:2核；内存:4G",
+            "f": "150G",
+            "g": "400G"
+        },
+        {
+            "a": "应急一体化综合指挥平台",
+            "b": "一体化api服务器1",
+            "c": "应用服务器",
+            "d": "金宏网",
+            "e": "CPU:1核；内存:2G",
+            "f": "130G",
+            "g": "200G"
+        },
+        {
+            "a": "应急一体化综合指挥平台",
+            "b": "一体化管理节点服务器1",
+            "c": "应用服务器",
+            "d": "政务外网公共服务域",
+            "e": "CPU:8核；内存:16G",
+            "f": "200G",
+            "g": "600G"
+        },
+        {
+            "a": "应急一体化综合指挥平台",
+            "b": "一体化管理节点服务器2",
+            "c": "应用服务器",
+            "d": "政务外网公共服务域",
+            "e": "CPU:4核；内存:8G",
+            "f": "50G",
+            "g": "500G"
+        },
+        {
+            "a": "应急一体化综合指挥平台",
+            "b": "一体化管理节点服务器3",
+            "c": "应用服务器",
+            "d": "政务外网公共服务域",
+            "e": "CPU:16核；内存:32G",
+            "f": "160G",
+            "g": "500G"
+        }
+      ],
+      dataList2: [
+      {
+            "a": "数字底座",
+            "b": "金宏网",
+            "c": "",
+            "d": "内网",
+            "e": "专线",
+            "f": "1600MB/s",
+            "g": "15.72.183.90"
+        },
+        {
+            "a": "数字底座",
+            "b": "金宏网",
+            "c": "",
+            "d": "内网",
+            "e": "专线",
+            "f": "2100MB/s",
+            "g": "15.72.183.91"
+        },
+        {
+            "a": "填报系统",
+            "b": "金宏网",
+            "c": "",
+            "d": "内网",
+            "e": "专线",
+            "f": "800MB/s",
+            "g": "15.72.184.9"
+        },
+        {
+            "a": "领导驾驶舱",
+            "b": "金宏网",
+            "c": "",
+            "d": "内网",
+            "e": "专线",
+            "f": "1600MB/s",
+            "g": "15.72.184.10"
+        },
+        {
+            "a": "区市指挥室",
+            "b": "金宏网",
+            "c": "",
+            "d": "内网",
+            "e": "专线",
+            "f": "1200MB/s",
+            "g": "15.72.184.11"
+        },
+        {
+            "a": "应急一体化综合指挥平台",
+            "b": "金宏网",
+            "c": "",
+            "d": "内网",
+            "e": "专线",
+            "f": "1200MB/s",
+            "g": "15.72.184.12"
+        },
+        {
+            "a": "消防一览",
+            "b": "金宏网",
+            "c": "",
+            "d": "内网",
+            "e": "专线",
+            "f": "1064MB/s",
+            "g": "15.72.182.107"
+        },
+        {
+            "a": "政务云系统",
+            "b": "金宏网",
+            "c": "",
+            "d": "内网",
+            "e": "专线",
+            "f": "1200MB/s",
+            "g": "15.72.182.108"
+        },
+        {
+            "a": "数字监控平台",
+            "b": "金宏网",
+            "c": "",
+            "d": "内网",
+            "e": "专线",
+            "f": "1064MB/s",
+            "g": "15.72.182.109"
+        },
+        {
+            "a": "应急一体化综合指挥平台",
+            "b": "金宏网",
+            "c": "",
+            "d": "内网",
+            "e": "专线",
+            "f": "800MB/s",
+            "g": "15.72.182.110"
+        }
+      ],
+      dataForm: {
+        name: "",
+      },
+    };
+  },
+  watch: {},
+  components: {},
+  created() {},
+  mounted() {},
+  methods: {
+    handleChose(index) {
+      this.choose = index;
+    },
+    reset() {},
+    query() {},
+    //云资源新增
+    yunadd(type,row) {
+      if(type=='add'){
+        this.yunaddForm.a="" 
+        this.yunaddForm.b=""
+        this.yunaddForm.c=""
+        this.yunaddForm.d=""
+        this.yunaddForm.e=""
+        this.yunaddForm.f=""
+        this.yunaddForm.g=""
+      }else{
+        this.yunaddForm.a=row.a
+        this.yunaddForm.b=row.b
+        this.yunaddForm.c=row.c
+        this.yunaddForm.d=row.d
+        this.yunaddForm.e=row.e
+        this.yunaddForm.f=row.f
+        this.yunaddForm.g=row.g
+      }
+      this.yunshow = true;
+    },
+    //网资源新增
+    wangadd(type,row) {
+      if(type=='add'){
+        this.wangaddForm.a="" 
+        this.wangaddForm.b=""
+        this.wangaddForm.c=""
+        this.wangaddForm.d=""
+        this.wangaddForm.e=""
+        this.wangaddForm.f=""
+        this.wangaddForm.g=""
+      }else{
+        this.wangaddForm.a=row.a
+        this.wangaddForm.b=row.b
+        this.wangaddForm.c=row.c
+        this.wangaddForm.d=row.d
+        this.wangaddForm.e=row.e
+        this.wangaddForm.f=row.f
+        this.wangaddForm.g=row.g
+      }
+      this.wangshow = true;
+    },
+ 
+  
+
+  },
+};
+</script>
+<style lang="scss" scoped>
+.status_change {
+  ::v-deep  .el-dialog__header{
+    background-color:#0058e1;
+    padding: 10px 10px 10px;
+    .el-dialog__title,.el-dialog__headerbtn i{
+      color: white;
+    }
+    
+  }
+  .dialog-footer{
+    text-align: center;
+  }
+}
+.form-minwidth-style {
+  width: 600px;
+}
+.second-title {
+  border-radius: 2px;
+  margin-top: 10px;
+  margin-bottom: 22px;
+  font-size: 18px;
+  cursor: pointer;
+  text-align: center;
+  background: #ebe5e5;
+  width: 200px;
+  height: 30px;
+  line-height: 30px;
+  display: table;
+}
+
+.departmentStyle {
+  display: table-cell;
+  width: 50%;
+  color: #fff;
+  background-color: #0058e1;
+  font-weight: bolder;
+}
+.departmentStyle1 {
+  display: table-cell;
+  width: 50%;
+}
+.el-tooltip__popper {
+  max-width: 50%;
+}
+// ::v-deep .el-table .cell {
+//   width: 200px;
+// }
+::v-deep .el-upload-list__item-name {
+  width: 400px;
+}
+</style>

From 5f155dc69aaa267a281e467ee2381503fd704e72 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Mon, 31 Oct 2022 14:07:39 +0800
Subject: [PATCH 07/16] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/home/components/CanAssignCase.vue    | 18 +++++++++++++++++-
 .../components/integrationServiceOrder.vue     | 15 +++++++++++++--
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/front/src/views/home/components/CanAssignCase.vue b/front/src/views/home/components/CanAssignCase.vue
index 71f0598b..9070763f 100644
--- a/front/src/views/home/components/CanAssignCase.vue
+++ b/front/src/views/home/components/CanAssignCase.vue
@@ -1,5 +1,7 @@
 <template>
   <div class="box">
+    <!-- <IntegrationServiceOrder ref="integrationServiceOrderDom" :orderArray="orderArray" :style="styleObj">
+    </IntegrationServiceOrder> -->
     <div class="CanCase">
       <div class="caseBox" v-for="(item, index) in caseList" :key="index" @click="toView(item)">
         <a-image :preview="false" style="width:300px;height:200px" :src="
@@ -7,13 +9,14 @@
             .attrValue
         " />
         <h3>{{ item.name }}</h3>
-        <p>发布时间 {{ item.updateDate }}</p>
+        <p>发布时间 {{ item.createDate }}</p>
       </div>
     </div>
   </div>
 </template>
 <script setup>
 import { ref, onMounted, onBeforeUnmount, watch, defineProps, defineEmits } from 'vue'
+import IntegrationServiceOrder from './integrationServiceOrder.vue'
 
 import { useRouter } from 'vue-router'
 const router = useRouter()
@@ -27,6 +30,19 @@ const props = defineProps({
     default: '组件服务',
   },
 })
+
+const orderArray = ref([
+  {
+    value: 'create_date',
+    name: '发布时间',
+    orderType: 'DESC',
+  },
+])
+
+const styleObj = ref({
+  'justify-content': 'flex-end',
+   "padding": "0 20px"
+})
 const emits = defineEmits(['saveSearchCodition'])
 
 const caseList = ref([])
diff --git a/front/src/views/home/components/integrationServiceOrder.vue b/front/src/views/home/components/integrationServiceOrder.vue
index 48f9debf..0f9bac85 100644
--- a/front/src/views/home/components/integrationServiceOrder.vue
+++ b/front/src/views/home/components/integrationServiceOrder.vue
@@ -1,5 +1,5 @@
 <template>
-  <ul class="integrationServiceOrder">
+  <ul class="integrationServiceOrder" :style="styleObj">
     <li v-for="(item, i) in integrationOrderList" :key="i" @click="
       changeOrder(i, item.value, item.orderType == 'DESC' ? 'ASC' : 'DESC')
     ">
@@ -14,7 +14,7 @@
   </ul>
 </template>
 <script setup>
-import { ref, reactive, nextTick, defineExpose } from 'vue'
+import { ref, reactive, nextTick, defineExpose, defineProps } from 'vue'
 import mybus from '@/myplugins/mybus'
 
 const orderList = [
@@ -39,7 +39,18 @@ const orderList = [
   //   orderType: 'DESC',
   // },
 ]
+
+const props = defineProps({
+  orderArray: { type: Array, default: null },
+  styleObj: { type: Object, default: null },
+})
+
+console.log('props.orderArray------------>', props.orderArray);
+
 const integrationOrderList = ref(JSON.parse(JSON.stringify(orderList)))
+if(props.orderArray) {
+  integrationOrderList.value = props.orderArray
+}
 const integrationOrder = reactive({
   orderField: '',
   orderType: '',

From 50c2d6264d3adffa39179dc800b186d1fa06dcd6 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Mon, 31 Oct 2022 14:08:04 +0800
Subject: [PATCH 08/16] =?UTF-8?q?renren-admin=E6=94=B9=E4=B8=BAucs-admin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/public/config/basicConfig.js         | 26 ++++++++++----------
 front/public/static/config/basicConfig.js | 30 +++++++++++------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/back/public/config/basicConfig.js b/back/public/config/basicConfig.js
index 2428c227..86da66bc 100644
--- a/back/public/config/basicConfig.js
+++ b/back/public/config/basicConfig.js
@@ -17,34 +17,34 @@ var CONFIGITEM = {
     // 青岛市大数据局
     qingdao: {
       previewUrl: 'http://15.72.183.90:7008/',
-      apiURL: 'http://15.72.183.90:8000/renren-admin',
-      websocketURL: 'ws://15.72.183.90:8000/renren-admin/websocket'
+      apiURL: 'http://15.72.183.90:8000/ucs-admin',
+      websocketURL: 'ws://15.72.183.90:8000/ucs-admin/websocket'
     },
     // 西海岸大数据局
     xihaian: {
       previewUrl: 'http://10.134.135.9:9796/',
-      // apiURL: 'http://10.134.135.9:8888/renren-admin',
-      // apiURL: 'http://10.16.5.35:8888/renren-admin', // 李志成-研发
-      apiURL: 'http://192.168.124.236:8888/renren-admin',
-      // apiURL: 'http://192.168.124.254:8888/renren-admin', // 李志成-远雄
-      websocketURL: 'ws://10.134.135.9:8888/renren-admin/websocket'
+      // apiURL: 'http://10.134.135.9:8888/ucs-admin',
+      // apiURL: 'http://10.16.5.35:8888/ucs-admin', // 李志成-研发
+      apiURL: 'http://192.168.124.236:8888/ucs-admin',
+      // apiURL: 'http://192.168.124.254:8888/ucs-admin', // 李志成-远雄
+      websocketURL: 'ws://10.134.135.9:8888/ucs-admin/websocket'
     },
     // 测试
     test: {
       previewUrl: 'http://192.168.124.243:9796/',
-      apiURL: 'http://192.168.124.243:8888/renren-admin',
-      websocketURL: 'ws://192.168.124.243:8888/renren-admin/websocket'
+      apiURL: 'http://192.168.124.243:8888/ucs-admin',
+      websocketURL: 'ws://192.168.124.243:8888/ucs-admin/websocket'
     },
     // 内网穿透
     frp: {
       previewUrl: 'http://124.222.94.39:9796/',
-      apiURL: 'http://124.222.94.39:8888/renren-admin',
-      websocketURL: 'ws://124.222.94.39:8888/renren-admin/websocket'
+      apiURL: 'http://124.222.94.39:8888/ucs-admin',
+      websocketURL: 'ws://124.222.94.39:8888/ucs-admin/websocket'
     },
     dev: {
       previewUrl: 'http://localhost:8080/',
-      apiURL: 'http://192.168.124.243:8888/renren-admin',
-      websocketURL: 'ws://192.168.124.243:8888/renren-admin/websocket'
+      apiURL: 'http://192.168.124.243:8888/ucs-admin',
+      websocketURL: 'ws://192.168.124.243:8888/ucs-admin/websocket'
     }
   }
 }
diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js
index 796563a2..1d1a525f 100644
--- a/front/public/static/config/basicConfig.js
+++ b/front/public/static/config/basicConfig.js
@@ -27,9 +27,9 @@ var CONFIGITEM = {
       backUrl: 'http://15.72.183.90:8001',
       previewUrl: 'http://15.72.183.90:7008/',
       //frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/',
-      apiURL: 'http://15.72.183.90:8000/renren-admin',
-      websocketURL: '15.72.183.90:8000/renren-admin',
-      // websocketURL: '192.168.124.233:8888/renren-admin',
+      apiURL: 'http://15.72.183.90:8000/ucs-admin',
+      websocketURL: '15.72.183.90:8000/ucs-admin',
+      // websocketURL: '192.168.124.233:8888/ucs-admin',
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
     },
@@ -45,10 +45,10 @@ var CONFIGITEM = {
       backUrl: 'http://15.72.183.90:8001',
       previewUrl: 'http://15.72.183.90:7008/',
       //frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/',
-      //apiURL: 'http://15.72.183.90:8000/renren-admin',
-      // websocketURL: '10.16.5.146:8888/renren-admin', // 姜永超
-      websocketURL: '10.18.1.99:8889/renren-admin',
-      // websocketURL: '10.16.5.35:8888/renren-admin',
+      //apiURL: 'http://15.72.183.90:8000/ucs-admin',
+      // websocketURL: '10.16.5.146:8888/ucs-admin', // 姜永超
+      websocketURL: '10.18.1.99:8889/ucs-admin',
+      // websocketURL: '10.16.5.35:8888/ucs-admin',
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
     },
@@ -69,10 +69,10 @@ var CONFIGITEM = {
       },
       backUrl: 'http://10.134.135.9:9797',
       previewUrl: 'http://10.134.135.9:9796/',
-      // websocketURL: '10.134.135.9:8888/renren-admin', // 正式环境
-      // websocketURL: '10.134.135.92:8888/renren-admin', // 测试环境
-      websocketURL: '192.168.124.254:8888/renren-admin', // 李志成-远雄
-      // websocketURL: '10.18.1.99:8889/renren-admin', // 研发
+      // websocketURL: '10.134.135.9:8888/ucs-admin', // 正式环境
+      // websocketURL: '10.134.135.92:8888/ucs-admin', // 测试环境
+      websocketURL: '192.168.124.254:8888/ucs-admin', // 李志成-远雄
+      // websocketURL: '10.18.1.99:8889/ucs-admin', // 研发
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
     },
@@ -87,8 +87,8 @@ var CONFIGITEM = {
       },
       backUrl: 'http://localhost:8001',
       previewUrl: 'http://192.168.124.243:9796/',
-      websocketURL: '192.168.124.243:8888/renren-admin',
-      // websocketURL: '10.18.1.99:8889/renren-admin',
+      websocketURL: '192.168.124.243:8888/ucs-admin',
+      // websocketURL: '10.18.1.99:8889/ucs-admin',
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
     },
@@ -103,7 +103,7 @@ var CONFIGITEM = {
       },
       backUrl: 'http://192.168.124.243:9797',
       previewUrl: 'http://192.168.124.243:9796/',
-      websocketURL: '192.168.124.243:8888/renren-admin',
+      websocketURL: '192.168.124.243:8888/ucs-admin',
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
     },
@@ -118,7 +118,7 @@ var CONFIGITEM = {
       },
       backUrl: 'http://124.222.94.39:9797',
       previewUrl: 'http://124.222.94.39:9796/',
-      websocketURL: '124.222.94.39:8888/renren-admin',
+      websocketURL: '124.222.94.39:8888/ucs-admin',
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
     },

From 76a7be9f48c6e1421a0cd79859f01768c827d674 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Mon, 31 Oct 2022 14:56:33 +0800
Subject: [PATCH 09/16] =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E9=A1=B5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/sys/dept.vue | 69 ++++++++++++++++++++++-------
 1 file changed, 53 insertions(+), 16 deletions(-)

diff --git a/back/src/views/modules/sys/dept.vue b/back/src/views/modules/sys/dept.vue
index b2c3d076..56fe60cc 100644
--- a/back/src/views/modules/sys/dept.vue
+++ b/back/src/views/modules/sys/dept.vue
@@ -3,22 +3,36 @@
     <div class="mod-sys__dept">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:dept:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('sys:dept:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" row-key="id" border style="width: 100%;">
         <el-table-column prop="name" :label="$t('dept.name')" header-align="center" min-width="150"></el-table-column>
-        <el-table-column prop="parentName" :label="$t('dept.parentName')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="sort" :label="$t('dept.sort')" header-align="center" align="center" width="80"></el-table-column>
+        <el-table-column prop="parentName" :label="$t('dept.parentName')" header-align="center" align="center">
+        </el-table-column>
+        <el-table-column prop="sort" :label="$t('dept.sort')" header-align="center" align="center" width="80">
+        </el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('sys:dept:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('sys:dept:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button v-if="$hasPermission('sys:dept:update')" type="text" size="small"
+              @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('sys:dept:delete')" type="text" size="small"
+              @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
         <el-table-column prop="type" label="类型" header-align="center" align="center" width="80"></el-table-column>
         <el-table-column prop="district" label="区划" header-align="center" align="center" width="80"></el-table-column>
       </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
     </div>
@@ -31,12 +45,16 @@ import AddOrUpdate from './dept-add-or-update'
 import qs from 'qs'
 export default {
   mixins: [mixinViewModule],
-  data () {
+  data() {
     return {
       mixinViewModuleOptions: {
         getDataListURL: '/sys/dept/list',
         deleteURL: '/sys/dept'
-      }
+      },
+      total: 0,
+      limit: 10,
+      page: 1,
+      dataList: []
     }
   },
   components: {
@@ -45,16 +63,35 @@ export default {
   watch: {
     dataList: {
       handler: function () {
-        this.init()
+        this.getData()
       }
     }
   },
   methods: {
-    init () {
-      debugger
-      this.$http.get('/sys/dept/list').then((res) => {
-        res.data.data.map((item, index) => {
-          if (item.district != null || item.children.length > 0) {
+    // 分页, 每页条数
+    pageSizeChangeHandle (val) {
+      this.page = 1
+      this.limit = val
+      this.getData()
+    },
+    // 分页, 当前页
+    pageCurrentChangeHandle (val) {
+      this.page = val
+      this.getData()
+    },
+    getData() {
+      // debugger
+      let _data = {
+        limt: this.limit,
+        page: this.page,
+      }
+      this.$http.get('sys/dept/page', {
+        params: _data
+      }).then((res) => {
+        this.total = res.data.data.total;
+        res.data.data.list.map((item, index) => {
+          console.log('item, index------------>', item, index);
+          if (item.district != null || item.children.length >= 0) {
             this.$http.get('/sys/region/' + item.district).then((data) => {
               this.dataList[index].district = data.data.data.name
               console.log('datafrom', this.dataList)
@@ -72,10 +109,10 @@ export default {
           }
         })
       })
-    }
+    },
   },
-  created () {
-    this.init()
+  created() {
+    this.getData()
   }
 }
 </script>

From 15426bccdc2134994800437f26e9a0ed6de9f9a5 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Mon, 31 Oct 2022 16:03:12 +0800
Subject: [PATCH 10/16] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=94=B3=E8=AF=B7=20?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E7=B3=BB=E7=BB=9F=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/api/home.js          |   9 +-
 front/src/views/home/apply.vue | 247 ++++++++++++++++-----------------
 2 files changed, 130 insertions(+), 126 deletions(-)

diff --git a/front/src/api/home.js b/front/src/api/home.js
index b3043eec..0b8269c3 100644
--- a/front/src/api/home.js
+++ b/front/src/api/home.js
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-01 19:19:40
  * @LastEditors: Light
- * @LastEditTime: 2022-10-26 10:35:36
+ * @LastEditTime: 2022-10-31 15:52:57
  * @Description: 告诉大家这是什么
  */
 import request from '@/utils/request'
@@ -63,6 +63,13 @@ export function pageWithAttrs(data) {
     data,
   })
 }
+// 筛选
+export function getAppListByDept() {
+  return request({
+    url: '/resource/getAppListByDept',
+    method: 'get',
+  })
+}
 // 获取hls视频流
 export function getHls(params) {
   return request({
diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index 0f99b1cd..26e1fcf8 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -260,7 +260,11 @@
   import { getCategoryTreePage, endProcess } from '@/api/personalCenter'
   import mybus from '@/myplugins/mybus'
   import { sgcDel, getApplyForm } from '@/api/personalCenter'
-  import { pageWithAttrs, updateIntegrationServices } from '@/api/home'
+  import {
+    pageWithAttrs,
+    updateIntegrationServices,
+    getAppListByDept,
+  } from '@/api/home'
   import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
   import { getIntegrationDetail, soldierApply } from '@/api/home'
   import { useStore } from 'vuex'
@@ -782,25 +786,18 @@
           })
         }
       }
-      pageWithAttrs({
-        pageNum: 1,
-        pageSize: 99999,
-        type: '应用资源',
-        name: '',
-        infoList: [],
-      }).then((res) => {
+      getAppListByDept().then((res) => {
+        console.log('res=====>', res.data.data)
         if (res.data.code == 0) {
-          if (res.data.data.records.length == 0) {
+          if (res.data.data.length == 0) {
             message.warning('该关键词，暂无应用资源！')
           } else {
             // 过滤本单位的应用系统
-            res.data.data.records.map((val) => {
-              if (val.deptName === deptName) {
-                systemOptions2.value.push({
-                  value: val.name,
-                  label: val.name,
-                })
-              }
+            res.data.data.map((val) => {
+              systemOptions2.value.push({
+                value: val.NAME,
+                label: val.NAME,
+              })
             })
             // console.log('第一次获取===================>', systemOptions2.value)
           }
@@ -958,130 +955,130 @@
   }
 </script>
 <style scoped lang="less">
-  #apply-container {
-    // background-color: #f5f8fc;
-    height: 100%;
-    width: 100%;
-    margin: 0.8rem auto 0;
+#apply-container {
+  // background-color: #f5f8fc;
+  height: 100%;
+  width: 100%;
+  margin: 0.8rem auto 0;
+  display: flex;
+  justify-content: space-between;
+
+  aside {
+    width: 282px;
+    height: 96%;
+    overflow-y: auto;
+    background-color: #fff;
+    margin: 1% 0 3%;
+  }
+
+  article {
+    width: 1090px;
+    height: 99%;
+    overflow-y: auto;
+    background-color: #fff;
+    margin: 1% auto;
+  }
+
+  .form-container {
+    padding: 20px 20px 30px 20px;
+
+    .title {
+      font-size: 20px;
+      color: #000;
+      font-weight: bold;
+      margin-bottom: 20px;
+    }
+  }
+
+  .base-info {
     display: flex;
     justify-content: space-between;
+  }
 
-    aside {
-      width: 282px;
-      height: 96%;
-      overflow-y: auto;
-      background-color: #fff;
-      margin: 1% 0 3%;
-    }
+  .flex-row-start {
+    justify-content: flex-start;
+    align-items: center;
+  }
 
-    article {
-      width: 1090px;
-      height: 99%;
-      overflow-y: auto;
-      background-color: #fff;
-      margin: 1% auto;
-    }
+  :deep(.ant-form-item-label) {
+    label {
+      color: #666;
+      font-size: 16px;
 
-    .form-container {
-      padding: 20px 20px 30px 20px;
-
-      .title {
-        font-size: 20px;
-        color: #000;
-        font-weight: bold;
-        margin-bottom: 20px;
+      &::after {
+        content: '';
       }
     }
-
-    .base-info {
-      display: flex;
-      justify-content: space-between;
-    }
-
-    .flex-row-start {
-      justify-content: flex-start;
-      align-items: center;
-    }
-
-    :deep(.ant-form-item-label) {
-      label {
-        color: #666;
-        font-size: 16px;
-
-        &::after {
-          content: '';
-        }
-      }
-    }
-
-    :deep(.ant-form-item-required) {
-      &::before {
-        font-size: 8px;
-        margin-right: 10px;
-      }
-    }
-
-    :deep(.ant-input) {
-      border: 1px solid #e0e0e0;
-      border-radius: 6px;
-    }
-
-    .success {
-      div {
-        width: 100px;
-        margin: 80px auto 40px;
-      }
-
-      text-align: center;
-      font-size: 20px;
-      font-weight: bold;
-      color: #000;
-    }
   }
 
-  .applicationScene {
-    :deep(.ant-select-selector) {
-      overflow-x: scroll;
-    }
-
-    :deep(.ant-select-selection-overflow) {
-      flex-wrap: nowrap;
+  :deep(.ant-form-item-required) {
+    &::before {
+      font-size: 8px;
+      margin-right: 10px;
     }
   }
 
-  textarea {
-    resize: none;
-    font-size: 14px;
-  }
-
-  .bottom-btn {
-    display: flex;
-    justify-content: center;
-    // position: fixed;
-  }
-
-  .cancel-apply {
-    width: 80px;
-    height: 38px;
-    margin-right: 20px;
-    background: #e1edfa;
-    color: #0087ff;
-    font-size: 14px;
+  :deep(.ant-input) {
+    border: 1px solid #e0e0e0;
     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;
+  .success {
+    div {
+      width: 100px;
+      margin: 80px auto 40px;
+    }
+
     text-align: center;
+    font-size: 20px;
+    font-weight: bold;
+    color: #000;
   }
+}
+
+.applicationScene {
+  :deep(.ant-select-selector) {
+    overflow-x: scroll;
+  }
+
+  :deep(.ant-select-selection-overflow) {
+    flex-wrap: nowrap;
+  }
+}
+
+textarea {
+  resize: none;
+  font-size: 14px;
+}
+
+.bottom-btn {
+  display: flex;
+  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>

From 1ad52d954c4cc507d92abc2c09848d3f3875f425 Mon Sep 17 00:00:00 2001
From: unknown <xiaoshangqing@Hisense.ad>
Date: Mon, 31 Oct 2022 16:29:19 +0800
Subject: [PATCH 11/16] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/components/header.vue            | 2 ++
 front/src/views/personalCenter/components/MyApply.vue | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index fe336352..bac92f97 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -587,6 +587,7 @@
   :deep(.ant-list-item) {
     border-bottom: 0.01rem solid #ccc;
     padding: 0.1rem;
+    cursor: default;
   }
 
   :deep(.ant-list-item-meta-title) {
@@ -602,6 +603,7 @@
       -webkit-line-clamp: 2;
       word-break: break-all;
       -webkit-box-orient: vertical;
+      cursor: default;
     }
 
     button {
diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue
index 7654f29e..32306460 100644
--- a/front/src/views/personalCenter/components/MyApply.vue
+++ b/front/src/views/personalCenter/components/MyApply.vue
@@ -44,12 +44,12 @@
           </div>
           <a-tooltip>
             <template #title>
-              {{ item.cameraList ? item.system : item.title }}
+              {{ item.cameraList ? item.system : (item.title|| item.name) }}
             </template>
             <div class="content-body-title">
               <span>
                 名称：{{
-                  item.cameraList ? item.system : item.title || item.name
+                  item.cameraList ? item.system : (item.title || item.name)
                 }}
               </span>
               <div></div>

From 2156e70433904b1ffe34394bc03cd7a9d060e3f6 Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Mon, 31 Oct 2022 17:47:38 +0800
Subject: [PATCH 12/16] =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E6=A0=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/modules/abilityStatistics/index.vue |  8 +--
 .../views/home/detailsPageconetentTree.vue    | 49 ++++++++++---------
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue
index 8c544ba2..d55a4e06 100644
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@@ -161,7 +161,7 @@
             </el-table-column>
             <el-table-column prop="yyzy" label="应用资源" min-width="100%">
             </el-table-column>
-            <el-table-column prop="hys" label="会议室" min-width="100%" v-show='departmentId == 2 || departmentId == 4'>
+            <el-table-column prop="hys" label="会客厅" min-width="100%" v-show='departmentId == 2 || departmentId == 4'>
             </el-table-column>
             <el-table-column prop="zj" label="总计" min-width="100%">
             </el-table-column>
@@ -321,7 +321,7 @@ export default {
         { name: '基础设施', key: 3 },
         { name: '数据资源', key: 4 },
         { name: '知识库', key: 5 },
-        { name: '会议室', value: 6 }
+        { name: '会客厅', value: 6 }
       ],
       tableData: [],
       tableDataClone: [],
@@ -347,9 +347,9 @@ export default {
         { name: '开发组件', value: 3 },
         { name: '业务组件', value: 4 },
         { name: '应用资源', value: 5 },
-        { name: '会议室', value: 6 }
+        { name: '会客厅', value: 6 }
       ], // 类型备选列表
-      typeOptions1: [// 能力上架隐藏会议室
+      typeOptions1: [// 能力上架隐藏会客厅
         { name: '智能算法', value: 1 },
         { name: '图层服务', value: 2 },
         { name: '开发组件', value: 3 },
diff --git a/front/src/views/home/detailsPageconetentTree.vue b/front/src/views/home/detailsPageconetentTree.vue
index 9401b8a0..d3bd2e2f 100644
--- a/front/src/views/home/detailsPageconetentTree.vue
+++ b/front/src/views/home/detailsPageconetentTree.vue
@@ -185,31 +185,32 @@
             treeData.value.sort((a, b) => {
               return sortArr.indexOf(a.key) - sortArr.indexOf(b.key)
             })
-            let deptId=user.value.deptId
-            treeData.value.forEach((child) => {
-              let childern=child.children
-              childern.forEach((childs) => {//第一层：市级
-           if(childs.key==deptId ){
-             childs.show=true
-             child.show=true
-             mybus.emit('paramsGetResources', [childs.key])
-              selectId.value =childs.key
-           }
-           if(childs.children && childs.children.length>0){//第二层 区级
-            let qu=childs.children
-            qu.forEach((qu) => {
-           if(qu.key==deptId ){
-             qu.show=true
-             childs.show=true
-             child.show=true
-              mybus.emit('paramsGetResources', [qu.key])
-              selectId.value = qu.key
-           }
-           })
-           }
-         })
+            //根据不同的权限展示不同的能力超市左侧树
+          //  let deptId=user.value.deptId
+        //     treeData.value.forEach((child) => {
+        //       let childern=child.children
+        //       childern.forEach((childs) => {//第一层：市级
+        //    if(childs.key==deptId ){
+        //      childs.show=true
+        //      child.show=true
+        //      mybus.emit('paramsGetResources', [childs.key])
+        //       selectId.value =childs.key
+        //    }
+        //    if(childs.children && childs.children.length>0){//第二层 区级
+        //     let qu=childs.children
+        //     qu.forEach((qu) => {
+        //    if(qu.key==deptId ){
+        //      qu.show=true
+        //      childs.show=true
+        //      child.show=true
+        //       mybus.emit('paramsGetResources', [qu.key])
+        //       selectId.value = qu.key
+        //    }
+        //    })
+        //    }
+        //  })
           
-          })
+        //   })
             console.log('左侧树结构数据======================>', treeData.value)
         
             showKey.value++

From 61bb1291c22bef829303933c1d4fd6176a9e4fe1 Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Mon, 31 Oct 2022 18:10:48 +0800
Subject: [PATCH 13/16] =?UTF-8?q?=E5=90=8E=E5=8F=B0-=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=9A=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99=E7=9A=84=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/sys/user.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/back/src/views/modules/sys/user.vue b/back/src/views/modules/sys/user.vue
index c77ab078..11e3ab37 100644
--- a/back/src/views/modules/sys/user.vue
+++ b/back/src/views/modules/sys/user.vue
@@ -45,21 +45,21 @@
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
         @sort-change="dataListSortChangeHandle" style="width: 100%">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="username" :label="$t('user.username')" sortable="custom" header-align="center"
+        <el-table-column prop="username" :label="$t('user.username')" header-align="center"
           align="center"></el-table-column>
         <el-table-column prop="realName" label="真实姓名" header-align="center" align="center"></el-table-column>
         <el-table-column prop="deptName" :label="$t('user.deptName')" header-align="center" align="center">
         </el-table-column>
         <el-table-column prop="email" :label="$t('user.email')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="mobile" :label="$t('user.mobile')" sortable="custom" header-align="center"
+        <el-table-column prop="mobile" :label="$t('user.mobile')"  header-align="center"
           align="center"></el-table-column>
-        <el-table-column prop="gender" :label="$t('user.gender')" sortable="custom" header-align="center"
+        <el-table-column prop="gender" :label="$t('user.gender')"  header-align="center"
           align="center">
           <template slot-scope="scope">
             {{ $getDictLabel('gender', scope.row.gender) }}
           </template>
         </el-table-column>
-        <el-table-column prop="status" :label="$t('user.status')" sortable="custom" header-align="center"
+        <el-table-column prop="status" :label="$t('user.status')"  header-align="center"
           align="center">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.status === 0" size="small" type="danger">{{
@@ -70,7 +70,7 @@
             }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="createDate" :label="$t('user.createDate')" sortable="custom" header-align="center"
+        <el-table-column prop="createDate" :label="$t('user.createDate')"  header-align="center"
           align="center" width="180"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">

From 493151d9f0c6d2588e3d5bd30abbba80a0a867e4 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Mon, 31 Oct 2022 19:45:21 +0800
Subject: [PATCH 14/16] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ResourceAggregation.vue        |    1 +
 front/src/views/home/DetailsPageconetent.vue  |    1 +
 front/src/views/home/infrastructurePage.vue   | 3817 +++++++++--------
 3 files changed, 1923 insertions(+), 1896 deletions(-)

diff --git a/front/src/views/abilityStatistics/components/ResourceAggregation.vue b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
index 0cbbfa31..3d9d4741 100644
--- a/front/src/views/abilityStatistics/components/ResourceAggregation.vue
+++ b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
@@ -461,6 +461,7 @@
       },
       yAxis: {
         name: '部门数量（个）',
+        minInterval: 1,
       },
       grid: {
         height: '65%',
diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index 1a6b2752..02e9a0b3 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -1190,6 +1190,7 @@
       const re = /^[0-9\u4E00-\u9FA5]*$/
       const getAppResources2 = () => {
         globalFlag.value = false
+        mybus.emit('changeRoomInput', searchValue.value)
         if (
           whoShow1.value.itShowQingDao &&
           paramsGetResources.type == '基础设施'
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 270ed253..a6b971d5 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -768,1237 +768,1297 @@
   </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, getEnkeUsers } from '@/api/home'
-import { initiateMeet } from '@/api/file'
-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'
-import { useStore } from 'vuex'
-const store = useStore()
-const username = store.getters['user/username']
-const props = defineProps({
-  // 模糊查
-  searchValue: { type: String, default: '' },
-  searchType: { 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 meetingList = ref([])
-const meetingPagination = ref({
-  total: 0,
-  current: 1,
-  pageSize: 5, //每页中显示5条数据
-  showSizeChanger: false,
-})
-const meetingSelect = reactive({ data: [] })
-const meetingSelectOld = reactive({ data: [] })
-const meetingOnSelectChange = (selectedRowKeys) => {
-  console.log('selectedRowKeys changed: ', selectedRowKeys, meetingSelect.data)
-  meetingSelect.data = selectedRowKeys
-  meetingSelectOld.data[meetingPagination.value.current - 1] =
-    meetingSelect.data
-}
-const videoList = ref([])
-const initMeeting = () => {
-  let str = '青岛市一网统揽项目组/'
-  // meetingSelect.data.map((val) => (str += val + '/'))
-  meetingSelectOld.data.map((val) => {
-    val.map((data) => (str += data + '/'))
+  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, getEnkeUsers } from '@/api/home'
+  import { initiateMeet } from '@/api/file'
+  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'
+  import { useStore } from 'vuex'
+  const store = useStore()
+  const username = store.getters['user/username']
+  const props = defineProps({
+    // 模糊查
+    searchValue: { type: String, default: '' },
+    searchType: { type: String, default: '' },
   })
-  initiateMeet(str).then((res) => {
-    console.log('组会=========>', res)
+  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 meetingColumns = ref([
-  {
-    title: '视频会议用户名称',
-    dataIndex: 'hostName',
-    key: 'hostName',
-  },
-])
-const getMeetingList = () => {
-  getEnkeUsers({
-    page: meetingPagination.value.current,
-    limit: meetingPagination.value.pageSize,
-  }).then((res) => {
-    meetingList.value = []
-    res.data.data.list.map((val) => {
-      val.key = val.hostName
-    })
-    meetingList.value = res.data.data.list
-    meetingPagination.value.total = res.data.data.total
-    meetingSelect.data =
-      meetingSelectOld.data[meetingPagination.value.current - 1]
-    console.log('会议列表=============>', res.data.data)
+  const meetingList = ref([])
+  const meetingPagination = ref({
+    total: 0,
+    current: 1,
+    pageSize: 5, //每页中显示5条数据
+    showSizeChanger: false,
   })
-}
-const hys = ref(require('@/assets/home/hys.png'))
-getMeetingList()
-const handleMeeting = (pag, filters, sorter) => {
-  console.log(pag, filters, sorter)
-  meetingPagination.value.current = pag.current
-  getMeetingList()
-}
-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
-}
-if (props.searchType) {
-  tabClick(0, props.searchType.value)
-}
-// 消息列表页面
-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 {
-        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 = []
-
-    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
-      ? ['视频资源']
-      : username == 'admin'
-      ? ['政务云资源', '视频资源', '城市云脑会客厅', '视频会议']
-      : ['政务云资源', '视频资源', '城市云脑会客厅'],
-  },
-])
-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) => {
-  debugger
-  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) => {
-  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 == '城市云脑会客厅') {
-    } 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 = '视频会议'
-    }
-    clickList.value[indexFather].content.splice(
-      clickList.value[indexFather].content.indexOf(name),
-      1
+  const meetingSelect = reactive({ data: [] })
+  const meetingSelectOld = reactive({ data: [] })
+  const meetingOnSelectChange = (selectedRowKeys) => {
+    console.log(
+      'selectedRowKeys changed: ',
+      selectedRowKeys,
+      meetingSelect.data
     )
-  } 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 = '视频标签'
+    meetingSelect.data = selectedRowKeys
+    meetingSelectOld.data[meetingPagination.value.current - 1] =
+      meetingSelect.data
+  }
+  const videoList = ref([])
+  const initMeeting = () => {
+    let str = '青岛市一网统揽项目组/'
+    // meetingSelect.data.map((val) => (str += val + '/'))
+    meetingSelectOld.data.map((val) => {
+      val.map((data) => (str += data + '/'))
+    })
+    initiateMeet(str).then((res) => {
+      console.log('组会=========>', res)
+    })
+  }
+  // 获取会议列表
+  const meetingColumns = ref([
+    {
+      title: '视频会议用户名称',
+      dataIndex: 'hostName',
+      key: 'hostName',
+    },
+  ])
+  const getMeetingList = () => {
+    getEnkeUsers({
+      page: meetingPagination.value.current,
+      limit: meetingPagination.value.pageSize,
+    }).then((res) => {
+      meetingList.value = []
+      res.data.data.list.map((val) => {
+        val.key = val.hostName
+      })
+      meetingList.value = res.data.data.list
+      meetingPagination.value.total = res.data.data.total
+      meetingSelect.data =
+        meetingSelectOld.data[meetingPagination.value.current - 1]
+      console.log('会议列表=============>', res.data.data)
+    })
+  }
+  const hys = ref(require('@/assets/home/hys.png'))
+  getMeetingList()
+  const handleMeeting = (pag, filters, sorter) => {
+    console.log(pag, filters, sorter)
+    meetingPagination.value.current = pag.current
+    getMeetingList()
+  }
+  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
+  }
+  if (props.searchType) {
+    tabClick(0, props.searchType.value)
+  }
+  // 消息列表页面
+  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()
       }
-      if (clickList.value[1]) {
-        clickList.value[1].content = []
+    } 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 {
+          tabClick(0, '政务云资源')
+        }
       }
-      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,
-            })
+    }
+
+    mybus.off('getListByParentId')
+    mybus.on('getListByParentId', (parentId) => {
+      mapSearchParam.value.parentId = parentId
+      getCamera()
+    })
+    mybus.off('changeRoomInput')
+    mybus.on('changeRoomInput', (val) => {
+      console.log('更改=======》')
+      roomInput.value = val
+      onSearch()
+    })
+    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
+    })
+    //点位点击
+    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
           }
         })
-      })
-      // 改变查询摄像头接口的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 = 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 = []
-      }
-      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)
+      let pointData = new Proxy(point.data, point)
+      onSelectChange(pointData, !check, '', '', 'proxy')
     })
-  }
-  console.log('选中的标签code', mapSearchParam.value)
-  mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + ''
-
-  if (name == '政务云资源' || name == '视频会议' || name == '感知资源') {
-    dataSource.value = []
-    dataSource2.value = []
-    console.log('视频会议=========>', dataSource, columns)
-    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
+        ? ['视频资源']
+        : username == 'admin'
+        ? ['政务云资源', '视频资源', '城市云脑会客厅', '视频会议']
+        : ['政务云资源', '视频资源', '城市云脑会客厅'],
+    },
+  ])
+  let clickList = ref([]) //存储点击的tab
+  if (!isXiHaiAn) {
+    tabList.value.push({
+      title: '政务云资源',
+      content: [],
+    })
+  }
+  const wrjVisible = ref(false)
+  const wrjName = ref('')
+  const wrjData = ref([])
 
-const apply = async () => {
-  if (selectedRowKeys.value.length != 0) {
-    // 判断最大数量
-    let maxNumRes = await judegNumber()
-    if (maxNumRes.data.code != 0) {
-      return
-    }
+  // 单兵、无人机-详情
+  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: '',
-            note1: JSON.stringify(selectedList.value),
-            resourceId: '1522550195055828996',
-            resourceName: '摄像头列表',
-            type: '基础设施',
+            description: data.description,
+            resourceId: data.id,
+            resourceName: data.wrjName,
+            type: data.type,
           },
         ],
-        deptId: dept.deptId,
+        deptId: dept.deptId || data.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
-    case '视频会议':
-      initMeeting()
-      break
-    default:
-      break
+  if (whoShow1.value.itShowXiHaiAn) {
+    tabList.value[0].content.push('无人机')
+    tabList.value[0].content.push('单兵设备')
   }
-}
-const wrjFlag = ref(false)
-// 西海岸-视频资源loading
-const loadingCamera = ref(false)
-const getCamera = (flag, str) => {
-  loadingCamera.value = true
-  if (flag) {
-    mapSearchParam.value.cameraName = str
+
+  // 单个预览，当前点击数据
+  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'
   }
-  console.log('初始化调用')
-  console.log(
-    '不选左侧树的时候不调用接口',
-    mapSearchParam.value,
-    selectType.value
-  )
-  if (!whoShow1.value.itShowXiHaiAn) {
-    if (selectType.value == '视频资源') {
-      getCameraByParentId(mapSearchParam.value)
+  // 打开图片预览
+  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) => {
+    debugger
+    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) => {
+    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 == '城市云脑会客厅') {
+      } 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 = '视频会议'
+      }
+      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 = 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 = []
+        }
+        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 == '视频会议' || name == '感知资源') {
+      dataSource.value = []
+      dataSource2.value = []
+      console.log('视频会议=========>', dataSource, columns)
+      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
+      case '视频会议':
+        initMeeting()
+        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)
         .then((res) => {
           console.log('res--查询摄像头---------->', res)
           loadingCamera.value = false
@@ -2009,381 +2069,478 @@ const getCamera = (flag, str) => {
           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)
-      .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',
+  defineExpose({
+    getCamera,
   })
-}
-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个摄像头！')
+  //加入申购车
+  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 {
-      selectedList.value.push(record)
-      selectedRowKeys.value.push(record.channelCode || record.channelId)
+      message.error('请选择需要添加申购车的数据')
     }
-  } 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 onSelectChange2 = (record, selected, selectedRows, nativeEvent, type) => {
-  console.log(
-    '已选中======================>',
+  // 表格
+  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
-  )
-  if (selected) {
-    selectedRowKeys.value.push(record.name)
-    selectedRows.value.push(record.name)
-  } else {
-    selectedRowKeys.value.splice(selectedRowKeys.value.indexOf(record.name), 1)
-    selectedRows.value.splice(selectedRowKeys.value.indexOf(record.name), 1)
+  ) => {
+    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个摄像头！')
+  const onSelectChange2 = (
+    record,
+    selected,
+    selectedRows,
+    nativeEvent,
+    type
+  ) => {
+    console.log(
+      '已选中======================>',
+      record,
+      selected,
+      selectedRows,
+      nativeEvent,
+      type
+    )
+    if (selected) {
+      selectedRowKeys.value.push(record.name)
+      selectedRows.value.push(record.name)
+    } else {
+      selectedRowKeys.value.splice(
+        selectedRowKeys.value.indexOf(record.name),
+        1
+      )
+      selectedRows.value.splice(selectedRowKeys.value.indexOf(record.name), 1)
+    }
+  }
+  const onSelectAll = (selected, selectedRows, changeRows) => {
+    if (selected) {
       changeRows.map((val) => {
-        selectedList.value.forEach((ele, index) => {
-          if (ele.channelCode == record.channelCode) {
-            selectedList.value.splice(index, 1)
-          }
+        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
+          )
         })
+      }
+    } 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
         )
       })
     }
-  } 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)
   }
-  console.log('heiheiheiehiehei', selected, selectedRows, changeRows)
-  mybus.emit('selectTablePoint', selectedList.value)
-}
-const onSelectAll2 = (selected, selectedRows, changeRows) => {
-  console.log(selected, selectedRows, changeRows)
-  if (selected) {
-  } else {
+  const onSelectAll2 = (selected, selectedRows, changeRows) => {
+    console.log(selected, selectedRows, changeRows)
+    if (selected) {
+    } else {
+    }
   }
-}
 
-// 切换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]
+  // 视频预览 提示
+  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)
   }
-  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;
-  background: #ffffff;
-  border-bottom: 0.01rem solid rgba(150, 144, 144, 0.3);
-
-  .infrastructrue-tab {
-    span {
-      display: inline-block;
-      height: 0.24rem;
-      font-size: 0.14rem;
-      line-height: 0.24rem;
-      border: 0;
-      border-radius: 0.12rem;
-      margin-left: 0.1rem;
-      text-align: center;
-      color: #666666;
-      cursor: pointer;
-      padding: 0 0.08rem;
-    }
-
-    .leftType {
-      margin: 0.2rem 0;
-      margin-right: 0.06rem;
-    }
-
-    .down {
-      background: #0087ff;
-      color: #ffffff;
-    }
-
-    .tabBox {
-      padding-bottom: 0.16rem;
-    }
-  }
-
-  .infrastructrue-content {
-    display: flex;
-    justify-content: space-between;
-    padding: 0.14rem 0.2rem 0.1rem;
+  .infrastructrueBox {
+    padding: 0.2rem;
     background: #ffffff;
+    border-bottom: 0.01rem solid rgba(150, 144, 144, 0.3);
 
-    .contentNum {
-      position: relative;
-      display: flex;
-
-      p {
+    .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;
-        padding: 0;
-        margin: 0;
+        cursor: pointer;
+        padding: 0 0.08rem;
+      }
 
-        span {
-          color: #0087ff;
-          font-size: 0.2rem;
-          font-weight: 500;
+      .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;
+
+      .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);
         }
       }
 
-      p:first-of-type {
-        padding-right: 0.16rem;
-        margin-right: 0.16rem;
-      }
+      .contentRight {
+        position: relative;
+        display: flex;
+        justify-content: space-between;
 
-      .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);
+        }
+
+        .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;
+        }
       }
     }
 
-    .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);
+    .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;
@@ -2400,431 +2557,299 @@ const handleUser = () => {
             width: 0.8rem;
             height: 0.36rem;
             background: #0558e1;
-            border-radius: 0.04rem;
+            border-radius: 0.06rem;
             font-size: 0.14rem;
           }
         }
 
         :deep(.ant-btn) {
-          background: #0558e1;
-          border-radius: 0.04rem;
-        }
-      }
-
-      .buttonAdd {
-        background: #0558e1;
-        border-radius: 0.04rem;
-        height: 0.36rem;
-        border-color: #0558e1;
-        margin-left: 0.1rem;
-      }
-    }
-  }
-
-  .infrastructrue-table {
-    .ant-table-striped :deep(.table-striped) td {
-      background-color: #fafafa;
-    }
-  }
-
-  .map-contain {
-    // width: 9.46rem;
-    height: 4.1rem;
-    margin-left: 0.16rem;
-    position: relative;
-  }
-}
-
-.roomBackground {
-  background: #0058e1;
-  color: #ffffff;
-}
-
-.nullBackground {
-  background: #f3f5f9;
-  color: #0087ff;
-}
-
-:deep(.ant-form-item-control-input-content) {
-  margin-left: 0.15rem;
-}
-
-:deep(.ant-col) {
-  .ant-form-item {
-    margin-bottom: 0;
-  }
-}
-
-.jinggaoD {
-  display: flex;
-  align-items: center;
-}
-
-.jinggaoNull {
-  display: none;
-}
-
-.imgJinggao {
-  width: 0.2rem;
-  height: 0.2rem;
-  background: url('~@/assets/home/jingao.png') no-repeat;
-  background-size: 100%;
-}
-
-.introduction {
-  :deep(.ant-form-item-control) {
-    margin-left: -2.1rem;
-  }
-}
-
-.roomBox {
-  .leftMake {
-    float: left;
-    margin-left: -1rem;
-    margin-top: -0.5rem;
-    font-size: 0.2rem;
-    cursor: pointer;
-
-    .leftTop {
-      width: 0.6rem;
-      height: 1.75rem;
-      border-top-left-radius: 0.08rem;
-      border-bottom-left-radius: 0.08rem;
-      padding: 0.13rem;
-      text-align: center;
-    }
-
-    .leftBottom {
-      width: 0.6rem;
-      height: 1.75rem;
-      border-top-left-radius: 0.08rem;
-      border-bottom-left-radius: 0.08rem;
-      padding: 0.2rem 0.13rem 0.1rem 0.1rem;
-      text-align: center;
-    }
-  }
-
-  .roomSearch {
-    display: flex;
-    align-items: center;
-
-    .searchInput {
-      display: flex;
-      margin-right: 0.2rem;
-      margin-left: 0.2rem;
-
-      // .ant-input-search {
-      //   max-width: 4rem;
-      // }
-      :deep(.ant-input) {
-        width: 2rem;
-        height: 0.36rem;
-        font-size: 0.14rem;
-        color: #b2b2b2;
-        background: #f5f5f5;
-      }
-
-      :deep(.ant-input-group-addon) {
-        display: inline-block;
-        margin-left: 0.1rem;
-
-        .ant-input-search-button {
-          width: 0.8rem;
-          height: 0.36rem;
-          background: #0558e1;
           border-radius: 0.06rem;
-          font-size: 0.14rem;
         }
       }
+    }
 
-      :deep(.ant-btn) {
-        border-radius: 0.06rem;
+    .roomTableList {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin: 0.4rem 0 0.2rem 0;
+
+      .roomTime {
+        display: flex;
+        align-items: center;
+
+        :deep(.ant-space-vertical) {
+          flex-direction: inherit;
+          margin-left: 0.2rem;
+        }
       }
     }
-  }
 
-  .roomTableList {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin: 0.4rem 0 0.2rem 0;
-
-    .roomTime {
+    .roomItem {
+      width: 10.3rem;
+      height: 2rem;
+      border-top: 1px #d5d4d4 solid;
       display: flex;
       align-items: center;
 
-      :deep(.ant-space-vertical) {
-        flex-direction: inherit;
-        margin-left: 0.2rem;
+      .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%;
+        }
       }
-    }
-  }
 
-  .roomItem {
-    width: 10.3rem;
-    height: 2rem;
-    border-top: 1px #d5d4d4 solid;
-    display: flex;
-    align-items: center;
+      .rightContent {
+        height: 1.75rem;
+        width: 5.8rem;
 
-    .leftImg {
-      width: 2.4rem;
-      height: 1.75rem;
-      margin: 0 0.3rem 0 0.15rem;
+        .topContent {
+          font-size: 0.2rem;
+          color: #000;
+          font-weight: 600;
+        }
 
-      // background: url('~@/assets/home/yyzy_square.png') no-repeat;
-      background-size: 100%;
-
-      img {
-        width: 100%;
-        height: 100%;
+        .centerContent {
+          display: flex;
+          justify-content: space-between;
+          font-size: 0.14rem;
+          margin: 0.15rem 0 0.2rem 0;
+        }
+        .bottonmContent {
+          width: 100%;
+          overflow: hidden; //超出隐藏
+          text-overflow: ellipsis; //超出文本设置为...
+          display: -webkit-box; //将div1转换为盒子模型
+          -webkit-line-clamp: 3; //设置div1的文本为2行
+          -webkit-box-orient: vertical; //从顶部向底部垂直布置子元素
+        }
       }
     }
 
-    .rightContent {
-      height: 1.75rem;
-      width: 5.8rem;
+    :deep(.ant-pagination) {
+      float: right;
+    }
 
-      .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;
-      }
-      .bottonmContent {
-        width: 100%;
-        overflow: hidden; //超出隐藏
-        text-overflow: ellipsis; //超出文本设置为...
-        display: -webkit-box; //将div1转换为盒子模型
-        -webkit-line-clamp: 3; //设置div1的文本为2行
-        -webkit-box-orient: vertical; //从顶部向底部垂直布置子元素
-      }
+    :deep(.ant-pagination) {
+      text-align: end;
     }
   }
-
-  :deep(.ant-pagination) {
-    float: right;
+  :deep(.ant-table-thead > tr > th) {
+    color: #5580f7 !important;
+    font-size: 16px !important;
+    font-weight: 600 !important;
   }
-
-  :deep(.ant-pagination) {
-    text-align: end;
-  }
-}
-:deep(.ant-table-thead > tr > th) {
-  color: #5580f7 !important;
-  font-size: 16px !important;
-  font-weight: 600 !important;
-}
 </style>
 <style lang="less">
-.wrj {
-  .ant-modal-body {
-    height: 700px !important;
-    overflow-y: auto;
-  }
-}
-
-.modalClass {
-  .ant-modal-body {
-    height: 4rem !important;
-    overflow-y: scroll !important;
-  }
-
-  .ant-modal-title {
-    font-weight: 600;
-  }
-
-  .ant-modal-content {
-    .ant-modal-header {
-      border-bottom: 0 !important;
+  .wrj {
+    .ant-modal-body {
+      height: 700px !important;
+      overflow-y: auto;
     }
   }
-}
 
-.appModal {
-  .ant-modal-body {
-    height: 4.8rem !important;
-    overflow-y: scroll !important;
-  }
+  .modalClass {
+    .ant-modal-body {
+      height: 4rem !important;
+      overflow-y: scroll !important;
+    }
 
-  .ant-modal-title {
-    font-weight: 600;
-  }
+    .ant-modal-title {
+      font-weight: 600;
+    }
 
-  .ant-modal-content {
-    .ant-modal-header {
-      border-bottom: 0 !important;
+    .ant-modal-content {
+      .ant-modal-header {
+        border-bottom: 0 !important;
+      }
     }
   }
-}
 
-.single-preview-modal {
-  .ant-modal-header {
-    background: url(~@/assets/home/video-background.png) no-repeat;
-    background-size: cover;
+  .appModal {
+    .ant-modal-body {
+      height: 4.8rem !important;
+      overflow-y: scroll !important;
+    }
+
+    .ant-modal-title {
+      font-weight: 600;
+    }
+
+    .ant-modal-content {
+      .ant-modal-header {
+        border-bottom: 0 !important;
+      }
+    }
   }
 
-  .ant-modal-title {
-    font-size: 0.16rem;
-    font-weight: 500;
-    color: #ffffff;
+  .single-preview-modal {
+    .ant-modal-header {
+      background: url(~@/assets/home/video-background.png) no-repeat;
+      background-size: cover;
+    }
+
+    .ant-modal-title {
+      font-size: 0.16rem;
+      font-weight: 500;
+      color: #ffffff;
+    }
+
+    .anticon {
+      color: #ffffff;
+    }
   }
 
-  .anticon {
-    color: #ffffff;
-  }
-}
+  .batch-preview-modal {
+    .batch-video {
+      width: 100%;
+      display: grid;
+      grid-template-columns: 50% 50%;
+      grid-template-rows: 50% 50%;
+      justify-content: center;
+      grid-row-gap: 10px;
+      grid-column-gap: 10px;
+    }
 
-.batch-preview-modal {
-  .batch-video {
-    width: 100%;
-    display: grid;
-    grid-template-columns: 50% 50%;
-    grid-template-rows: 50% 50%;
-    justify-content: center;
-    grid-row-gap: 10px;
-    grid-column-gap: 10px;
+    .ant-pagination-item-link {
+      background-color: #5580f7;
+    }
+
+    .ant-modal-header {
+      background: url(~@/assets/home/video-background.png) no-repeat;
+      background-size: cover;
+    }
+
+    .ant-modal-title {
+      font-size: 0.16rem;
+      font-weight: 500;
+      color: #ffffff;
+    }
+
+    .anticon {
+      color: #ffffff;
+    }
   }
 
-  .ant-pagination-item-link {
-    background-color: #5580f7;
+  /*禁用video的controls（要慎重！不要轻易隐藏掉，会导致点击视频不能播放）*/
+  video::-webkit-media-controls {
+    display: none !important;
   }
 
-  .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;
+  .waterMark {
+    position: absolute;
+    z-index: 99999999;
+    color: #0058e1;
+    font-size: 22px;
+    font-weight: bold;
+    opacity: 0.4;
+    transform: rotate(-25deg);
+    width: 470px;
   }
-}
 
-/*禁用video的controls（要慎重！不要轻易隐藏掉，会导致点击视频不能播放）*/
-video::-webkit-media-controls {
-  display: none !important;
-}
+  // 左上
+  .waterMark-left-top {
+    left: 50px;
+    top: 100px;
+    text-align: left;
+  }
 
-.video-cover {
-  position: absolute;
-  left: 0;
-  top: 0;
-  bottom: 0;
-  right: 0;
-  background: transparent;
-  z-index: 99999999;
-  cursor: pointer;
-}
+  // 右上
+  .waterMark-right-top {
+    right: 50px;
+    top: 100px;
+    text-align: right;
+  }
 
-.batch-video-cover {
-  position: absolute;
-  left: 0;
-  top: 0;
-  background: transparent;
-  height: 288px;
-  z-index: 99999999;
-  width: 512px;
-  margin-top: 14px;
-  cursor: pointer;
-}
+  // 左下
+  .waterMark-left-bottom {
+    left: 50px;
+    bottom: 100px;
+    text-align: left;
+  }
 
-.waterMark {
-  position: absolute;
-  z-index: 99999999;
-  color: #0058e1;
-  font-size: 22px;
-  font-weight: bold;
-  opacity: 0.4;
-  transform: rotate(-25deg);
-  width: 470px;
-}
+  // 右下
+  .waterMark-right-bottom {
+    right: 50px;
+    bottom: 100px;
+    text-align: right;
+  }
 
-// 左上
-.waterMark-left-top {
-  left: 50px;
-  top: 100px;
-  text-align: left;
-}
+  // 批量
+  .batch-waterMark {
+    position: absolute;
+    z-index: 99999999;
+    color: #0058e1;
+    font-size: 14px;
+    opacity: 0.4;
+    transform: rotate(-25deg);
+    width: 200px;
+  }
 
-// 右上
-.waterMark-right-top {
-  right: 50px;
-  top: 100px;
-  text-align: right;
-}
+  // 左上
+  .batch-waterMark-left-top {
+    left: 30px;
+    top: 50px;
+    text-align: left;
+  }
 
-// 左下
-.waterMark-left-bottom {
-  left: 50px;
-  bottom: 100px;
-  text-align: left;
-}
+  // 右上
+  .batch-waterMark-right-top {
+    text-align: right;
+    right: 30px;
+    top: 80px;
+  }
 
-// 右下
-.waterMark-right-bottom {
-  right: 50px;
-  bottom: 100px;
-  text-align: right;
-}
+  // 左下
+  .batch-waterMark-left-bottom {
+    left: 30px;
+    bottom: 50px;
+    text-align: left;
+  }
 
-// 批量
-.batch-waterMark {
-  position: absolute;
-  z-index: 99999999;
-  color: #0058e1;
-  font-size: 14px;
-  opacity: 0.4;
-  transform: rotate(-25deg);
-  width: 200px;
-}
+  // 右下
+  .batch-waterMark-right-bottom {
+    right: 20px;
+    bottom: 30px;
+    text-align: right;
+  }
 
-// 左上
-.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 {
+  .disabled-text {
+    cursor: not-allowed;
+    opacity: 0.5;
     color: #666666;
+
+    &:hover {
+      color: #666666;
+    }
   }
-}
 </style>

From ad6a1c14de207349284a24cadfdf2dc7d62e4662 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Mon, 31 Oct 2022 20:23:26 +0800
Subject: [PATCH 15/16] =?UTF-8?q?BUg=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/DetailsPageconetent.vue | 13 +++++++++++++
 front/src/views/home/infrastructurePage.vue  | 13 ++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index 02e9a0b3..42474b96 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -1190,6 +1190,15 @@
       const re = /^[0-9\u4E00-\u9FA5]*$/
       const getAppResources2 = () => {
         globalFlag.value = false
+        let newQuery = JSON.parse(
+          JSON.stringify(router.currentRoute.value.query)
+        )
+        newQuery.str = searchValue.value
+        router
+          .replace({
+            query: newQuery,
+          })
+          .then(() => {})
         mybus.emit('changeRoomInput', searchValue.value)
         if (
           whoShow1.value.itShowQingDao &&
@@ -1544,6 +1553,9 @@
         paramsGetResources2.value.regionId = ids
         getAppResources()
       })
+      mybus.on('changeSearchValue', (val) => {
+        searchValue.value = val
+      })
       mybus.on('paramsGetResources', (ids) => {
         if (ids && ids.length > 0) {
           paramsGetResources.deptIds = ids
@@ -1846,6 +1858,7 @@
     },
     beforeUnmount() {
       mybus.off('getCameraByParentId')
+      mybus.off('changeSearchValue')
       mybus.off('selectCardsitem')
       mybus.off('paramsGetResources')
       mybus.off('changeCondition')
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index a6b971d5..80efcaff 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -943,6 +943,10 @@
   const fileList = ref([])
   const useForm = Form.useForm
   const roomInput = ref('')
+  let roomStr = router.currentRoute.value.query.str
+  if (roomStr) {
+    roomInput.value = roomStr
+  }
   const rulesRef = reactive({
     bookDate: [
       {
@@ -1238,7 +1242,14 @@
   }
   //   搜索
   const onSearch = (searchValue) => {
-    debugger
+    let newQuery = JSON.parse(JSON.stringify(router.currentRoute.value.query))
+    newQuery.str = roomInput.value
+    router
+      .replace({
+        query: newQuery,
+      })
+      .then(() => {})
+    mybus.emit('changeSearchValue', roomInput.value)
     searchData()
     chengguoSearch()
   }

From abd89f6eeb7fd72e47f0bf4ace0223acfc6cf551 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 1 Nov 2022 09:20:18 +0800
Subject: [PATCH 16/16] Merge branch 'hi-ucs-pre' into release

# Conflicts:
#	back/public/config/basicConfig.js
---
 back/public/config/basicConfig.js | 2 +-
 back/src/i18n/zh-CN.js            | 4 ++--
 back/src/views/main-navbar.vue    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/back/public/config/basicConfig.js b/back/public/config/basicConfig.js
index c3ad3fd6..1f847ce8 100644
--- a/back/public/config/basicConfig.js
+++ b/back/public/config/basicConfig.js
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-08-25 14:37:49
  * @LastEditors: Light
- * @LastEditTime: 2022-11-01 09:15:08
+ * @LastEditTime: 2022-11-01 09:20:12
  * @Description: 告诉大家这是什么
  */
 var _global = {}
diff --git a/back/src/i18n/zh-CN.js b/back/src/i18n/zh-CN.js
index 2f5ea310..acefdd06 100644
--- a/back/src/i18n/zh-CN.js
+++ b/back/src/i18n/zh-CN.js
@@ -3,8 +3,8 @@ const t = {}
 t.loading = '加载中...'
 
 t.brand = {}
-t.brand.lg = '资源管理中心'
-t.brand.mini = '数字政务'
+t.brand.lg = '能力管理中心'
+t.brand.mini = '一体化综合指挥'
 
 t.add = '新增'
 t.delete = '删除'
diff --git a/back/src/views/main-navbar.vue b/back/src/views/main-navbar.vue
index 2c212e54..0df84d2c 100644
--- a/back/src/views/main-navbar.vue
+++ b/back/src/views/main-navbar.vue
@@ -12,7 +12,7 @@
           $t("brand.lg")
         }}</a>
         <span>——</span>
-        <span class="back-title-text">政务系统能力知识库</span>
+        <span class="back-title-text">后台管理系统</span>
       </h1>
     </div>
     <div class="aui-navbar__body">