Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev

front/src/views/home/infrastructurePage.vue

@@ -409,12 +409,12 @@
       <div class="infrastructrue-content" v-if="!wrjFlag">
         <!-- 表格数据统计 -->
         <div class="contentNum">
-          <p>
+          <p v-if="selectType !== '视频会议'">
             备选
             <span>{{ pagination.total || 0 }}</span>
             个
           </p>
-          <p>
+          <p v-if="selectType !== '视频会议'">
             已选
             <span>{{ selectedRowKeys.length }}</span>
             个
@@ -458,7 +458,9 @@
             添加至申购车
           </a-button>
           <a
-            stlyle="width: 100px;
+            style="
+              display: inline-block;
+              width: 100px;
               height: 36px;
               line-height: 36px;
               text-align: center;
@@ -466,7 +468,7 @@
               border-radius: 5px;
               font-size: 14px;
               color: #fff;
-                  }"
+            "
             v-if="selectType == '视频会议'"
             href="/static/download/金宏视频会议系统参会终端(10.1.101.504)_20200211.rar"
           >
@@ -488,7 +490,10 @@
         </div>
       </div>
       <!-- 表格 -->
-      <div class="infrastructrue-table" v-if="!wrjFlag">
+      <div
+        class="infrastructrue-table"
+        v-if="!wrjFlag && selectType !== '视频会议'"
+      >
         <a-table
           class="ant-table-striped"
           :dataSource="dataSource"
@@ -533,6 +538,26 @@
           </template>
         </a-table>
       </div>
+      <div
+        class="infrastructrue-table"
+        v-if="!wrjFlag && selectType == '视频会议'"
+      >
+        <a-table
+          class="ant-table-striped"
+          :dataSource="meetingName"
+          :columns="meetingColumns"
+          :scroll="{ y: tableHeight }"
+          rowKey="key"
+          :rowClassName="
+            (record, index) => (index % 2 === 1 ? 'table-striped' : null)
+          "
+          :showSizeChanger="false"
+          :row-selection="{
+            selectedRowKeys: meetingSelect,
+            onChange: meetingOnSelectChange,
+          }"
+        ></a-table>
+      </div>
       <!-- 西海岸-无人机、单兵设备 -->
       <div class="infrastructrue-table" v-else-if="isXiHaiAn && wrjFlag">
         <a-table
@@ -779,6 +804,9 @@
   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: '' },
@@ -818,9 +846,21 @@
           'fullScreen',
         ], //显示所有按钮,
   })
+  const meetingSelect = ref([])
+  const meetingOnSelectChange = (selectedRowKeys) => {
+    console.log(
+      'selectedRowKeys changed: ',
+      selectedRowKeys,
+      meetingSelect.value
+    )
+    meetingSelect.value = selectedRowKeys
+  }
+
   const videoList = ref([])
   const initMeeting = () => {
-    initiateMeet('青岛市一网统揽项目组/一网统揽平台组/').then((res) => {
+    let str = ''
+    meetingSelect.value.map((val) => (str += val + '/'))
+    initiateMeet(str).then((res) => {
       console.log('组会=========>', res)
     })
   }
@@ -1011,12 +1051,9 @@
       title: '设施类型',
       content: isXiHaiAn
         ? ['视频资源']
-        : [
+        : username == 'admin'
-            '政务云资源',
+        ? ['政务云资源', '视频资源', '城市云脑会客厅', '视频会议']
-            '视频资源' /**',感知资源' */,
+        : ['政务云资源', '视频资源', '城市云脑会客厅'],
-            '城市云脑会客厅',
-            '视频会议',
-          ],
     },
   ])
   let clickList = ref([]) //存储点击的tab
@@ -1641,6 +1678,7 @@
     if (name == '政务云资源' || name == '视频会议' || name == '感知资源') {
       dataSource.value = []
       dataSource2.value = []
+      console.log('视频会议=========>', dataSource, columns)
       pagination.value.total = 0
     } else {
       if (name !== '无人机' && name !== '单兵设备') {
@@ -2034,6 +2072,20 @@
       key: 'channelId',
     },
   ])
+  const meetingColumns = ref([
+    {
+      title: '视频会议用户名称',
+      dataIndex: 'name',
+      key: 'name',
+    },
+  ])
+  const meetingName = ref([
+    { name: '一网统揽平台组', key: '一网统揽平台组' },
+    { name: '市气象局', key: '市气象局' },
+    { name: '地铁集团', key: '地铁集团' },
+    { name: '市公安局', key: '市公安局' },
+    { name: '市交通运输局', key: '市交通运输局' },
+  ])
   // 西海岸--状态展示
   if (isXiHaiAn) {
     columns.value.splice(2, 0, {
@@ -2094,6 +2146,32 @@
     mybus.emit('selectTablePoint', selectedList.value)
     console.log('已选中======================>', selectedList.value)
   }
+  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) => {
@@ -2128,6 +2206,12 @@
     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) => {