合并

.gitignore

@@ -9,4 +9,5 @@ front/public/index.html
 back/dist-西海岸-后台管理-v0.8.2.1.zip
 back/dist-市局-后台管理-v0.8.2.3.zip
 back/dist-西海岸-后台管理-v0.8.2.4.d.zip
-*.zip
+*.zip
+front/public/static/config/basicConfig.js

front/src/api/home.js

@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-01 19:19:40
  * @LastEditors: Light
- * @LastEditTime: 2022-10-24 10:36:56
+ * @LastEditTime: 2022-10-25 09:51:56
  * @Description: 告诉大家这是什么
  */
 import request from '@/utils/request'
@@ -110,6 +110,13 @@ export function initiateMeet(data) {
     data: data,
   })
 }
+export function getEnkeUsers(params) {
+  return request({
+    url: '/enke/getEnkeUsers',
+    method: 'get',
+    params: params,
+  })
+}
 
 // 组件服务
 export function ApplicationServe(data) {

front/src/api/user.js

@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2022-03-29 17:48:03
- * @LastEditors: hisense.liangjunhua
+ * @LastEditors: Light
- * @LastEditTime: 2022-07-15 16:42:22
+ * @LastEditTime: 2022-10-25 09:37:05
  * @Description: 告诉大家这是什么
  */
 import request from '@/utils/request'
@@ -23,6 +23,13 @@ export async function socialLogin(data) {
   })
 }
 
+export function getRole(params) {
+  return request({
+    url: '/sys/role/' + params,
+    method: 'get',
+    params,
+  })
+}
 export function getUserInfo(redict) {
   //此处为了兼容mock.js使用data传递accessToken，如果使用mock可以走headers
   // debugger
@@ -30,8 +37,8 @@ export function getUserInfo(redict) {
     url: '/sys/user/info',
     method: 'get',
     headers: {
-      REQUESTURI:redict
+      REQUESTURI: redict,
-    }
+    },
   })
 }
 export function getDeptAll() {

front/src/views/home/components/searchResultList.vue

@@ -230,13 +230,8 @@
                   </span>
                 </template>
               </div>
-              <div
+              <div v-if="selectCardsname === '打包模式'" class="label-content1">
-                v-if="
+                发布时间：
-                  selectCardsname === '打包模式'
-                "
-                class="label-content1"
-              >
-              发布时间：
                 <template v-if="item.createDate">
                   <span>
                     {{ item.createDate.substring(0, 10) + ' ' }}
@@ -300,11 +295,13 @@
                 >
                   申请量：{{ item.applyCount || 0 }}次
                 </div>
+                <!-- 青岛不展示数据量 -->
                 <div
                   v-if="
                     selectCardsname === '数据资源' &&
                     selectCardsname !== '融合服务' &&
-                    selectCardsname !== '赋能场景'
+                    selectCardsname !== '赋能场景' &&
+                    whoShow1.itShowXiHaiAn
                   "
                 >
                   数据量：{{ item.sjlCount || 0 }}
@@ -1004,7 +1001,7 @@
           margin: 0 10px 0 0;
 
           .header-right {
-           // display: flex;
+            // display: flex;
             font-size: 14px;
             color: #212121;
 

front/src/views/home/infrastructurePage.vue

@@ -544,18 +544,19 @@
       >
         <a-table
           class="ant-table-striped"
-          :dataSource="meetingName"
+          :dataSource="meetingList"
           :columns="meetingColumns"
           :scroll="{ y: tableHeight }"
           rowKey="key"
           :rowClassName="
             (record, index) => (index % 2 === 1 ? 'table-striped' : null)
           "
-          :showSizeChanger="false"
+          :pagination="meetingPagination"
           :row-selection="{
-            selectedRowKeys: meetingSelect,
+            selectedRowKeys: meetingSelect.data,
             onChange: meetingOnSelectChange,
           }"
+          @change="handleMeeting"
         ></a-table>
       </div>
       <!-- 西海岸-无人机、单兵设备 -->
@@ -782,7 +783,7 @@
     defineExpose,
     computed,
   } from 'vue'
-  import { getUser, initiateMeet } from '@/api/home'
+  import { getUser, initiateMeet, getEnkeUsers } from '@/api/home'
   import {
     getCameraByParentId,
     getStreamByChannelCode,
@@ -846,24 +847,66 @@
           'fullScreen',
         ], //显示所有按钮,
   })
-  const meetingSelect = ref([])
+  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.value
+      meetingSelect.data
     )
-    meetingSelect.value = selectedRowKeys
+    meetingSelect.data = selectedRowKeys
+    meetingSelectOld.data[meetingPagination.value.current - 1] =
+      meetingSelect.data
   }
-
   const videoList = ref([])
   const initMeeting = () => {
-    let str = ''
+    let str = '青岛市一网统揽项目组/'
-    meetingSelect.value.map((val) => (str += val + '/'))
+    // 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)
+    })
+  }
+  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) // 视频批量预览
@@ -2072,20 +2115,6 @@
       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, {
@@ -2597,6 +2626,11 @@
       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 {