Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev

2022-10-12 16:01:10 +08:00 · 2022-10-12 16:01:10 +08:00 · e0ca9166e4
parent 6d3d16bbdf 672981d051
commit e0ca9166e4
9 changed files with 946 additions and 1009 deletions
--- a/back/public/config/basicConfig.js
+++ b/back/public/config/basicConfig.js
@ -2,16 +2,16 @@
 * @Author: hisense.wuhongjian
 * @Date: 2022-08-25 14:37:49
 * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-08-27 14:25:39
+ * @LastEditTime: 2022-10-12 13:40:14
 * @Description: 告诉大家这是什么
 */
 var _global = {}
 var CONFIGITEM = {
-  version: 'qingdao', // 青岛
+  // version: 'qingdao', // 青岛
  // version: 'xihaian', // 西海岸
  // version: 'test', // 测试
  // version: 'frp', // 内网穿透
-  // version: 'dev', // 开发
+  version: 'dev', // 开发
  vNum: 'v0.8.7.2',
  configData: {
    // 青岛市大数据局
@ -24,7 +24,8 @@ var CONFIGITEM = {
    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://10.16.5.35:8888/renren-admin', // 李志成-研发
+      apiURL: 'http://192.168.124.254:8888/renren-admin', // 李志成-远雄
      websocketURL: 'ws://10.134.135.9:8888/renren-admin/websocket'
    },
    // 测试
--- a/front/public/static/config/basicConfig.js
+++ b/front/public/static/config/basicConfig.js
@ -1,15 +1,15 @@
 /*
 * @Author: hisense.wuhongjian
 * @Date: 2020-07-07 16:03:23
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-09-19 09:36:49
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-10-11 10:46:03
 * @Description: 系统静态参数配置
 */
 var _global = {}
 var CONFIGITEM = {
  // version: 'qingdao', //青岛
-  version: 'xihaian', // 西海岸
-  // version: 'dev', // 开发
+  //version: 'xihaian', // 西海岸
+  version: 'dev', // 开发
  // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
  //version: 'test', // 测试
  //version: 'frp', // 内网穿透
--- a/front/src/store/modules/user.js
+++ b/front/src/store/modules/user.js
@ -53,7 +53,7 @@ const mutations = {
   * @param {*} state
   * @param {*} username
   */
-   setRealname(state, realName) {
+  setRealname(state, realName) {
    state.realName = realName
  },
  // 设置角色
@ -126,16 +126,16 @@ const actions = {
   * @returns
   */
  async getUserInfo({ commit }) {
-    const { data } = await getUserInfo()
-    if (!data) {
+    const res = await getUserInfo()
+    if (!res || !res.data) {
      message.error(`验证失败，请重新登录...`)
      return false
    }
    // debugger
-    commit('setUsername', data.data.username)
-    commit('setRealname', data.data.realName)
-    commit('setRole', data.data.roleIdList.length)
-    commit('setUserId', data.data.id)
+    commit('setUsername', res.data.data.username)
+    commit('setRealname', res.data.data.realName)
+    commit('setRole', res.data.data.roleIdList.length)
+    commit('setUserId', res.data.data.id)
    // TODO 获取用户信息，后续执行部分操作
    // let { username, avatar, roles, ability } = data
    // if (username && roles && Array.isArray(roles)) {
@ -168,6 +168,7 @@ const actions = {
   * @param {*} { commit, dispatch }
   */
  async resetAll({ dispatch }) {
+    debugger
    await dispatch('setAccessToken', '')
    await dispatch('acl/setFull', false, {
      root: true,
--- a/front/src/utils/request.js
+++ b/front/src/utils/request.js
@ -11,14 +11,8 @@ import store from '@/store'
 import qs from 'qs'
 import router from '@/router'
 // import { isArray } from '@/utils/validate'
-import {
-  message
-} from 'ant-design-vue'
-import {
-  getAccessToken,
-  setAccessToken
-} from '@/utils/accessToken'
-
+import { message } from 'ant-design-vue'
+import { getAccessToken, setAccessToken } from '@/utils/accessToken'

 let loadingInstance

@ -33,12 +27,14 @@ const handleCode = (code, msg, res) => {
  switch (code) {
    case 401:
      debugger
-      store.dispatch('user/resetAll').catch(() => { })
+      store.dispatch('user/resetAll').catch(() => {})
      break
    case 403:
-      router.push({
-        path: '/401'
-      }).catch(() => { })
+      router
+        .push({
+          path: '/401',
+        })
+        .catch(() => {})
      break
    case 500:
      message.error(msg || '接口异常')
@ -76,7 +72,7 @@ instance.interceptors.request.use(
    if (
      config.data &&
      config.headers['Content-Type'] ===
-      'application/x-www-form-urlencoded;charset=UTF-8'
+        'application/x-www-form-urlencoded;charset=UTF-8'
    )
      config.data = qs.stringify(config.data)
    if (debounce.some((item) => config.url.includes(item))) {
@ -103,17 +99,14 @@ instance.interceptors.response.use(
    console.log('接口返回headers', response.headers)
    console.log('接口返回REDIRECT', response.headers.redirect)
    response['Access-Control-Expose-Headers'] = 'redirect'
-    const {
-      code,
-      message
-    } = response.data
+    const { code, message } = response.data

    if (response.headers.token) {
      setAccessToken(response.headers.token)
    }
    if (response.headers.redirect) {
-      const _old_href = window.location.href.split('#')[0];
-      const _new_href = response.headers.redirect.split('#')[0];
+      const _old_href = window.location.href.split('#')[0]
+      const _new_href = response.headers.redirect.split('#')[0]
      window.location.replace(response.headers.redirect)
      // url 相同，强制刷新
      if (_old_href === _new_href) {
@ -124,7 +117,7 @@ instance.interceptors.response.use(
    if (response.headers.redirect === '/#/login') {
      var keys = document.cookie.match(/[^ =;]+(?=\=)/g)
      if (keys) {
-        for (var i = keys.length; i--;) {
+        for (var i = keys.length; i--; ) {
          document.cookie =
            keys[i] + '=0;path=/;expires=' + new Date(0).toUTCString() //清除当前域名下的,例如：m.kevis.com
          document.cookie =
@ -168,14 +161,14 @@ instance.interceptors.response.use(
    console.log('接口error', error)
    if (loadingInstance) loadingInstance.close()

-    const {
-      response,
-      message
-    } = error
+    const { response, message } = error
    if (error.response) {
      console.log('接口返回', response)
      console.log('接口返回headers', response.headers)
      console.log('接口返回REDIRECT', response.headers.redirect)
+      const { status, data } = response
+
+      handleCode(status, data.msg || message, response.headers.redirect)
      if (response.headers.token) {
        setAccessToken(response.headers.token)
      }
@ -183,17 +176,10 @@ instance.interceptors.response.use(
        window.location.replace(response.headers.redirect)
        return Promise.resolve()
      }
-      const {
-        status,
-        data
-      } = response

-      handleCode(status, data.msg || message, response.headers.redirect)
      return Promise.reject(error)
    } else {
-      let {
-        message
-      } = error
+      let { message } = error
      if (message === 'Network Error') {
        message = '后端接口连接异常'
      }
--- a/front/src/vab/plugins/permissions.js
+++ b/front/src/vab/plugins/permissions.js
@ -1,8 +1,8 @@
 /*
 * @Author: hisense.wuhongjian
 * @Date: 2022-04-01 17:23:11
- * @LastEditors: Light
- * @LastEditTime: 2022-10-10 16:43:58
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-10-11 13:59:18
 * @Description: 告诉大家这是什么
 */
 /**
@ -26,7 +26,7 @@ router.beforeEach(async (to, from, next) => {
  // if (SSOTOKEN) {
  //   setAccessToken(SSOTOKEN)
  // }
-
+  console.log('验证白名单', routesWhiteList)
  const token = getAccessToken()
  console.log('token', token)
  let hasToken = token
@ -45,6 +45,7 @@ router.beforeEach(async (to, from, next) => {
      router.addRoute(item)
    })
    if (routesWhiteList.indexOf(to.path) !== -1) {
+      debugger
      next()
    } else {
      // 这里是一个单点登录的入口
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@ -1085,7 +1085,7 @@ export default defineComponent({

    // 青岛-数据处理
    const getQingDao = (res) => {
-      ; ((res.data && res.data.data && res.data.data.data) || []).forEach(
+      ((res.data && res.data.data && res.data.data.data) || []).forEach(
        (val) => {
          val.id = val.guid // id
          val.name = val.zyname // 名字
@ -1101,7 +1101,7 @@ export default defineComponent({
    }
    // 青岛-西海岸处理
    const getXiHaiAn = (res) => {
-      ; ((res.data && res.data.data && res.data.data.list) || []).forEach(
+      ((res.data && res.data.data && res.data.data.list) || []).forEach(
        (val) => {
          val.id = val.serviceId // id
          val.name = val.serviceName // 名字
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@ -330,7 +330,6 @@
                <a-input v-model:value="formState.name" style="width: 72%" />
              </a-form-item>
            </a-col>
-            <!-- v-bind="validateInfos.phone" -->
            <a-col :span="8">
              <a-form-item
                name="phone"
@ -416,7 +415,6 @@
            <span>{{ pagination.total || 0 }}</span>
            个
          </p>
-          <!-- <i class="boundary"></i> -->
          <p>
            已选
            <span>{{ selectedRowKeys.length }}</span>
@ -425,7 +423,6 @@
        </div>
        <!-- 右侧 -->
        <div class="contentRight">
-          <!-- 搜索@search="onSearch" -->
          <div class="searchInput" v-if="isXiHaiAn">
            <a-input-search
              v-model:value="mapSearchParam.cameraName"
@ -490,10 +487,10 @@
          @change="handleTableChange"
          :row-selection="{
            selectedRowKeys: selectedRowKeys,
-            // onChange: onSelectChange,
            onSelect: onSelectChange,
            onSelectAll: onSelectAll,
          }"
+          :loading="loadingCamera"
        >
          <template #bodyCell="{ column, record }">
            <template v-if="isXiHaiAn && column.dataIndex === 'status'">
@ -512,18 +509,6 @@
              >
                预览
              </a>
-              <!-- <a
-                v-else
-                @click="
-                  openPicture(
-                    record.channelCode ||
-                      record.channelId ||
-                      record.channelCode.channelId
-                  )
-                "
-              >
-                预览
-              </a> -->
            </template>
          </template>
        </a-table>
@ -566,19 +551,19 @@
      >
        <template #footer></template>
        <div style="width: 100%; display: flex; justify-content: center">
-          <div style="width: 100%; height: 100%; position: relative">
+          <div style="width: 100%; height: 100%; position: relative" v-show="isXiHaiAn">
            <!-- 西海岸--预览视频--遮罩 todo-->
-            <div class="video-cover" @click="videoShowMsg" v-show="isXiHaiAn"></div>
-            <div class="waterMark waterMark-left-top" v-show="isXiHaiAn">
+            <div class="video-cover" @click="videoShowMsg"></div>
+            <div class="waterMark waterMark-left-top">
              {{ userInfo.usernameShow }}
            </div>
-            <div class="waterMark waterMark-right-top" v-show="isXiHaiAn">
+            <div class="waterMark waterMark-right-top">
              {{ userInfo.realNameShow }}
            </div>
-            <div class="waterMark waterMark-left-bottom" v-show="isXiHaiAn">
+            <div class="waterMark waterMark-left-bottom">
              {{ userInfo.usernameShow }}
            </div>
-            <div class="waterMark waterMark-right-bottom" v-show="isXiHaiAn">
+            <div class="waterMark waterMark-right-bottom">
              {{ userInfo.realNameShow }}
            </div>
            <vue3VideoPlay v-bind="options" />
@ -843,13 +828,6 @@
      },
    ],
    matter: [{ min: 1, max: 500, required: true, message: '可输入500字内容' }],
-    // phone: [
-    //   {
-    //     required: true,
-    //     pattern: /^1[3|4|5|7|8|9][0-9]\d{8}$/,
-    //     message: '请输入正确的手机号',
-    //   },
-    // ],
    dept: [
      {
        required: true,
@ -948,7 +926,6 @@

      dataSource.value = param.dataSource
      pagination.value.total = param.total
-      // getCamera()
    })
    //点位点击
    mybus.off('pointMarkerClick')
@ -1004,10 +981,6 @@
      {
        arr: [
          {
-            // description:
-            //   '申请单兵手持便携终端，提告前端人员执法透明度，加强执法人员与指挥中心实时沟通。',
-            // resourceId: 'dbsb',
-            // type: '单兵设备',
            description: data.description,
            resourceId: data.id,
            resourceName: data.wrjName,
@ -1444,14 +1417,6 @@
        pagination.value.total = 0
        selectType.value = '感知资源'
      } else if (name == '城市云脑会客厅') {
-        //     room.value = false
-        //     wrjFlag.value = true
-        //     showMap.value = false
-        // roomYuyue.value = true
-        //     roomResult.value = false
-        //     tabList.value[1] = []
-        //     emits('add', 6)
-        //     searchData()
      }
      clickList.value[indexFather].content.splice(
        clickList.value[indexFather].content.indexOf(name),
@ -1491,12 +1456,10 @@
            mapSearchParam.value.labelCodes.push(item.labelCode)
          })
        }
-        // todo
        mapSearchParam.value.gpsX = ''
        mapSearchParam.value.gpsY = ''
        mapSearchParam.value.radius = ''
        mapSearchParam.value.type = ''
-        console.log('mapSearchParam----->查询条件', mapSearchParam.value)
        mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + ''
        emits('add', 1)
        getCamera()
@ -1717,7 +1680,6 @@
          videoList.value.push(ob)
        })
      }
-      console.log('验证数据的准确性', videoList)
      batchVisible.value = true
    } else {
      message.error('请选择需要预览的数据')
@ -1750,7 +1712,6 @@
          videoList.value.push(ob)
        })
      }
-      console.log('验证数据的准确性', videoList)
      batchPicVisible.value = true
    } else {
      message.error('请选择需要预览的数据')
@ -1778,8 +1739,6 @@
  }
  const videoClean = () => {
    //视频预览弹窗关闭后不清除选中行
-    // selectedList.value = []
-    // selectedRowKeys.value = []
    videoList.value = []
    current.value = 1
  }
@ -1787,11 +1746,8 @@
  const changePage = (page) => {}
  // 一键申请
  const dept = reactive({})
-  // eslint-disable-next-line no-undef
  if (infrastructure) {
-    // eslint-disable-next-line no-undef
    dept.deptId = infrastructure.deptId || ''
-    // eslint-disable-next-line no-undef
    dept.deptName = infrastructure.deptName || ''
  }

@ -1809,7 +1765,6 @@
  }

  const apply = async () => {
-    console.log('一键申请', selectedList.value)
    if (selectedRowKeys.value.length != 0) {
      // 判断最大数量
      let maxNumRes = await judegNumber()
@ -1831,6 +1786,7 @@
          deptName: dept.deptName,
        },
      ]
+      console.log('一键申请', arr)
      localStorage.setItem('applyList', JSON.stringify(arr))
      router.push({
        path: '/apply',
@ -1851,30 +1807,27 @@
        break
    }
  }
-  // // 添加至购物车
-  // const addShopCar = () => {
-  //   console.log('添加至购物车')
-  // }
  const wrjFlag = ref(false)
+  // 西海岸-视频资源loading
+  const loadingCamera = ref(false)
  const getCamera = (flag, str) => {
-    console.log(
-      'mapSearchParam.value.cameraName------------>',
-      mapSearchParam.value.cameraName
-    )
+    loadingCamera.value = true;
    if (flag) {
      mapSearchParam.value.cameraName = str
-      console.log('赋值===============》', str, mapSearchParam.value)
    }
    console.log('初始化调用')
    console.log('不选左侧树的时候不调用接口', mapSearchParam.value)
    if (!whoShow1.value.itShowXiHaiAn) {
      getCameraByParentId(mapSearchParam.value).then((res) => {
-        console.log('RRRRRRRRRR', res.data.data)
+        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 {
-      console.log('mapSearchParam------------>', mapSearchParam)
      let params = {
        regionId:
          mapSearchParam.value.parentId || '70be8c5b664f4bcf869d82f2e8335051',
@ -1911,9 +1864,13 @@
        }
      }
      getCameraByCondition(params).then((res) => {
+        console.log('res--查询摄像头---------->', res);
+        loadingCamera.value = false;
        dataSource.value = res.data.data
        pagination.value.total = res.data.count
-        console.log('根据parent查询摄像头', res.data.data)
+      }).catch(err => {
+        loadingCamera.value = false;
+        message.error(err)
      })
    }
  }
@ -1931,9 +1888,7 @@
          note1: [v],
        })
      })
-      console.log('_arr------------>', _arr);
      sgcInsert(_arr).then((res) => {
-        console.log('res------申购车------>', res);
        if(res.data.code !== 0) {
          return message.error(res.data.msg)
        }
@ -2001,7 +1956,6 @@
      align: 'center',
    },
  ])
-  // const allClick = ref([])
  const onSelectChange = (
    record,
    selected,
@ -2009,7 +1963,6 @@
    nativeEvent,
    type
  ) => {
-    console.log('hahhahah', record, selected, selectedRows, nativeEvent)
    record = JSON.parse(JSON.stringify(record))
    if (selected) {
      if (selectedRowKeys.value.length == 1000) {
@ -2041,9 +1994,6 @@
      if (selectedRowKeys.value.length > 1000) {
        message.warning('最多只能添加1000个摄像头！')
        changeRows.map((val) => {
-          // selectedList.value = selectedList.value.filter(
-          //   (item) => item.idtCameraChannel !== val.idtCameraChannel
-          // )
          selectedList.value.forEach((ele, index) => {
            if (ele.channelCode == record.channelCode) {
              selectedList.value.splice(index, 1)
--- a/front/src/views/newHome/components/CapabilityConvergence.vue
+++ b/front/src/views/newHome/components/CapabilityConvergence.vue
@ -8,65 +8,40 @@
      <div class="bottom">
        <div class="item">
          <div class="zj">组件服务</div>
-          <div
-            class="name"
-            v-for="(item, index) in zjList.slice(0, 5)"
-            :key="item.name"
-            :class="index == 4 ? 'name-last' : ''"
-            @click="selectOne1(item.name)"
-          >
+          <div class="name" v-for="(item, index) in zjList.slice(0, 5)" :key="item.name"
+            :class="index == 4 ? 'name-last' : ''" @click="selectOne1(item.name)">
            {{ item.name + '-' + item.num + '项' }}
          </div>
          <div class="btn" @click="jumpPage('组件服务')">查看更多</div>
        </div>
        <div class="item">
          <div class="yy">应用资源</div>
-        <div
-            class="name"
-            v-for="(item, index) in yyList.slice(0, 5)"
-            :key="item.name"
-            :class="index == 4 ? 'name-last' : ''"
-            @click="selectOne11(item.name)"
-          >
+          <div class="name" v-for="(item, index) in yyList.slice(0, 5)" :key="item.name"
+            :class="index == 4 ? 'name-last' : ''" @click="selectOne11(item.name)">
            {{ item.name + '-' + item.num + '项' }}
          </div>
          <div class="btn" @click="jumpPage('应用资源')">查看更多</div>
        </div>
        <div class="item">
          <div class="jc">基础设施</div>
-          <div
-            class="name"
-            v-for="(item, index) in jcList.slice(0, 5)"
-            :key="item.name"
-            :class="index == 2 ? 'name-last' : ''"
-            @click="selectOne2(item.name)"
-          >
+          <div class="name" v-for="(item, index) in jcList.slice(0, 5)" :key="item.name"
+            :class="index == 2 ? 'name-last' : ''" @click="selectOne2(item.name)">
            {{ item.name + '-' + item.num + '项' }}
          </div>
          <div class="btn" @click="jumpPage('基础设施')">查看更多</div>
        </div>
        <div class="item">
          <div class="sj">数据资源</div>
-          <div
-            class="name"
-            v-for="(item, index) in sjList"
-            :key="item.id"
-            :class="index == 4 ? 'name-last' : ''"
-            @click="selectOne3(item.name)"
-          >
+          <div class="name" v-for="(item, index) in sjList" :key="item.id" :class="index == 4 ? 'name-last' : ''"
+            @click="selectOne3(item.name)">
            {{ index + 1 }}-{{ item.name }}
          </div>
          <div class="btn" @click="jumpPage('数据资源')">查看更多</div>
        </div>
        <div class="item">
          <div class="zs">知识库</div>
-          <div
-            class="name"
-            v-for="(item, index) in zsList"
-            :key="item.id"
-            :class="index == 4 ? 'name-last' : ''"
-            @click="openHref(item)"
-          >
+          <div class="name" v-for="(item, index) in zsList" :key="item.id" :class="index == 4 ? 'name-last' : ''"
+            @click="openHref(item)">
            {{ index + 1 }}-{{ item.name }}
          </div>
          <div class="btn" @click="jumpPage('知识库')">查看更多</div>
@ -76,448 +51,424 @@
  </div>
 </template>
 <script setup>
-  import {
-    pageWithAttrs,
-    getDataResource,
-    selectInfrastructureList,
-    selectCollectComponentList,
-    selectCollectResourceList
-  } from '@/api/home.js'
-  import { ref, reactive } from 'vue'
-  import { useRouter } from 'vue-router'
-  import { useStore } from 'vuex'
-  import { updateVisits, browsingInsert, getSoldierList } from '@/api/home'
-  import { message, Upload } from 'ant-design-vue'
-  import mybus from '@/myplugins/mybus'
-  const store = useStore()
-  const router = useRouter()
-  const zjList = ref([])
-  const jcList = ref([])
-  const sjList = ref([])
-  const yyList = ref([])
-  // 知识库模块数据
-  const zsList = ref([])
-  // const jcList = ref([])
-  const paramsGetResources = {
-    districtId: '',
-    pageNum: 1,
-    pageSize: 5,
-    type: '',
-    name: '',
-    infoList: [],
-    orderField: 'total', // total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
-    orderType: 'DESC', // ASC 升序  DESC 降序
-  }
-  console.log('dataShowdev==========================>', whoShow)
-  // eslint-disable-next-line no-undef
-  const whoShow1 = ref(whoShow)
-  const interfaceSuccess = ref(0)
-  const object = reactive({
-    yyNum: '',
-    zjNum: '',
-    jcNum: '',
-    sjNum: '',
-    zsNum: '',
-  })
-  const getAppResources = (type, obj) => {
-    paramsGetResources.type = type
-    if (type === '数据资源' && !whoShow1.value.itShowBaoTou) {
-      getDataResource({
-        serviceName: paramsGetResources.name || '', //资源名称
-        orderField: whoShow1.value.itShowQingDao ? 'fbrq' : 'createTime', //排序字段
-        orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc
-        pageNum: paramsGetResources.pageNum, //页码
-        pageSize: paramsGetResources.pageSize, //分页大小
-      }).then((res) => {
-        console.log('数据资源==================>', res.data.data)
-        if (whoShow1.value.itShowQingDao) {
-          res.data.data.data.forEach((val) => {
-            val.id = val.guid // id
-            val.name = val.zyname // 名字
-            val.sjlCount = val.sjcczl // 数据量
-            val.applyCount = val.syqk // 申请量
-            val.deptName = val.TGBM // 部门
-            val.createDate = val.fbrq // 发布时间
-            val.description = val.xgxt // 描述
-          })
-          obj.value = res.data.data.data || []
-          object.sjNum = res.data.data.rows
-        } else if (whoShow1.value.itShowXiHaiAn) {
-          res.data.data.list.forEach((val) => {
-            val.id = val.serviceId // id
-            val.name = val.serviceName // 名字
-            val.sjlCount = val.requestQuantity // 数据量
-            val.applyCount = val.requestCount // 申请量
-            val.deptName = val.departmentName // 部门
-            val.createTime = val.createTime.split('.')[0]
-            val.createDate = val.createTime // 发布时间
-          })
-          obj.value = res.data.data.list || []
-          object.sjNum = res.data.data.total
-        }
-      })
-    } else {
-      let type = paramsGetResources.type
-   
-      if (type == '基础设施') {
-        jcList.value = []
-        selectInfrastructureList().then((res) => {
-          console.log('基础设施==========>', res.data.data)
-          for (const key in res.data.data) {
-            if (whoShow1.value.itShowXiHaiAn) {
-              if (key === '视频资源') {
-                jcList.value.push({
-                  name: key,
-                  num: res.data.data[key],
-                })
-              }
-            } else {
+import {
+  pageWithAttrs,
+  getDataResource,
+  selectInfrastructureList,
+  selectCollectComponentList,
+  selectCollectResourceList
+} from '@/api/home.js'
+import { ref, reactive } from 'vue'
+import { useRouter } from 'vue-router'
+import { useStore } from 'vuex'
+import { updateVisits, browsingInsert, getSoldierList } from '@/api/home'
+import { message, Upload } from 'ant-design-vue'
+import mybus from '@/myplugins/mybus'
+const store = useStore()
+const router = useRouter()
+const zjList = ref([])
+const jcList = ref([])
+const sjList = ref([])
+const yyList = ref([])
+// 知识库模块数据
+const zsList = ref([])
+// const jcList = ref([])
+const paramsGetResources = {
+  districtId: '',
+  pageNum: 1,
+  pageSize: 5,
+  type: '',
+  name: '',
+  infoList: [],
+  orderField: 'total', // total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
+  orderType: 'DESC', // ASC 升序  DESC 降序
+}
+console.log('dataShowdev==========================>', whoShow)
+// eslint-disable-next-line no-undef
+const whoShow1 = ref(whoShow)
+const interfaceSuccess = ref(0)
+const object = reactive({
+  yyNum: '',
+  zjNum: '',
+  jcNum: '',
+  sjNum: '',
+  zsNum: '',
+})
+const getAppResources = (type, obj) => {
+  paramsGetResources.type = type
+  if (type === '数据资源' && !whoShow1.value.itShowBaoTou) {
+    getDataResource({
+      serviceName: paramsGetResources.name || '', //资源名称
+      orderField: whoShow1.value.itShowQingDao ? 'fbrq' : 'createTime', //排序字段
+      orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc
+      pageNum: paramsGetResources.pageNum, //页码
+      pageSize: paramsGetResources.pageSize, //分页大小
+    }).then((res) => {
+      console.log('数据资源==================>', res.data.data)
+      if (whoShow1.value.itShowQingDao) {
+        res.data.data.data.forEach((val) => {
+          val.id = val.guid // id
+          val.name = val.zyname // 名字
+          val.sjlCount = val.sjcczl // 数据量
+          val.applyCount = val.syqk // 申请量
+          val.deptName = val.TGBM // 部门
+          val.createDate = val.fbrq // 发布时间
+          val.description = val.xgxt // 描述
+        })
+        obj.value = res.data.data.data || []
+        object.sjNum = res.data.data.rows
+      } else if (whoShow1.value.itShowXiHaiAn) {
+        res.data.data.list.forEach((val) => {
+          val.id = val.serviceId // id
+          val.name = val.serviceName // 名字
+          val.sjlCount = val.requestQuantity // 数据量
+          val.applyCount = val.requestCount // 申请量
+          val.deptName = val.departmentName // 部门
+          val.createTime = val.createTime.split('.')[0]
+          val.createDate = val.createTime // 发布时间
+        })
+        obj.value = res.data.data.list || []
+        object.sjNum = res.data.data.total
+      }
+    })
+  } else {
+    let type = paramsGetResources.type
+
+    if (type == '基础设施') {
+      jcList.value = []
+      selectInfrastructureList().then((res) => {
+        console.log('基础设施------res------>', res);
+        for (const key in res.data.data) {
+          if (whoShow1.value.itShowXiHaiAn) {
+            if (key === '视频资源') {
              jcList.value.push({
                name: key,
                num: res.data.data[key],
              })
            }
+          } else {
+            jcList.value.push({
+              name: key,
+              num: res.data.data[key],
+            })
          }
-          // 西海岸-单兵设备、无人机 获取数量
-          if (whoShow1.value.itShowXiHaiAn) {
-            getSoldierData('无人机')
-              .then((res) => {
-                let { total = 0 } = res.data.data
-                jcList.value.push({
-                  name: '无人机',
-                  num: total,
-                })
+        }
+        // 西海岸-单兵设备、无人机 获取数量
+        if (whoShow1.value.itShowXiHaiAn) {
+          getSoldierData('无人机')
+            .then((res) => {
+              let { total = 0 } = res.data.data
+              jcList.value.push({
+                name: '无人机',
+                num: total,
              })
-              .catch((err) => {
-                console.log('err--无人机---------->', err)
+            })
+            .catch((err) => {
+              console.log('err--无人机---------->', err)
+            })
+          getSoldierData('单兵设备')
+            .then((res) => {
+              let { total = 0 } = res.data.data
+              jcList.value.push({
+                name: '单兵设备',
+                num: total,
              })
-            getSoldierData('单兵设备')
-              .then((res) => {
-                let { total = 0 } = res.data.data
-                jcList.value.push({
-                  name: '单兵设备',
-                  num: total,
-                })
-              })
-              .catch((err) => {
-                console.log('err--单兵设备---------->', err)
-              })
-          }
-        })
-      }   
-      else if (type == '组件服务') {
-        zjList.value = []
-        selectCollectComponentList().then((res) => {
-          for (const key in res.data.data) {
-            if (whoShow1.value.itShowXiHaiAn) {
-              if (key === '视频资源') {
-                zjList.value.push({
-                  name: key,
-                  num: res.data.data[key],
-                })
-              }
-            } else {
-              zjList.value.push({
-                name: key,
-                num: res.data.data[key],
-              })
-            }
-          }
-        })
-      }     
-      else if (type == '应用资源') {
-        yyList.value = []
-        selectCollectResourceList().then((res) => {
-          for (const key in res.data.data) {
-            if (whoShow1.value.itShowXiHaiAn) {
-              if (key === '视频资源') {
-                yyList.value.push({
-                  name: key,
-                  num: res.data.data[key],
-                })
-              }
-            } else {
-              yyList.value.push({
-                name: key,
-                num: res.data.data[key],
-              })
-            }
-          }
-        })
-      } 
-      else {
-        pageWithAttrs(paramsGetResources).then((res) => {
-          console.log('object个数======>', type)
-          obj.value = res.data.data.records
-          switch (type) {
-            case '组件服务':
-              assignmentMethod('zjNum', res)
-              break
-            case '应用资源':
-              assignmentMethod('yyNum', res)
-              break
-            case '基础设施':
-              assignmentMethod('jcNum', res)
-              break
-            case '知识库':
-              assignmentMethod('zsNum', res)
-              break
-          }
-        })
-      }
-    }
-  }
-
-  // todo 获取无人机、单兵设备
-  const getSoldierData = (name) => {
-    let _params = {
-      type: name,
-      page: 1,
-      limit: 10,
-    }
-    return new Promise((resolve, reject) => {
-      getSoldierList(_params)
-        .then((res) => {
-          resolve(res)
-          console.log('res---获取无人机、单兵设备--------->', res)
-          if (res.data.code !== 0) {
-            return message.error(res.data.msg)
-          }
-        })
-        .catch((err) => {
-          reject(err)
-        })
-    })
-  }
-
-  const openHref = (item) => {
-    console.log(item.id, 'wowowo')
-    console.log(item.visits, 'wowowo')
-    browsingInsert({ resourceId: item.id }).then((res) => {
-      // console.log(res)
-    })
-    const arrList = ref([])
-    arrList.value = JSON.parse(window.sessionStorage.getItem('visits'))
-    if (arrList.value.indexOf(item.id) === -1) {
-      arrList.value.push(item.id)
-      updateVisits({
-        id: item.id,
-        visits: item.visits || '0',
-      }).then(() => {
-        window.sessionStorage.setItem('visits', JSON.stringify(arrList.value))
+            })
+            .catch((err) => {
+              console.log('err--单兵设备---------->', err)
+            })
+        }
+      })
+    }
+    else if (type == '组件服务') {
+      zjList.value = []
+      selectCollectComponentList().then((res) => {
+        console.log('组件服务----res-------->', res);
+        for (const key in res.data.data) {
+          console.log('key------------>', key);
+          zjList.value.push({
+            name: key,
+            num: res.data.data[key],
+          })
+        }
+        console.log('zjList------------>', zjList);
+      })
+    }
+    else if (type == '应用资源') {
+      yyList.value = []
+      selectCollectResourceList().then((res) => {
+        console.log('应用资源---res--------->', res);
+        for (const key in res.data.data) {
+          yyList.value.push({
+            name: key,
+            num: res.data.data[key],
+          })
+        }
+      })
+    }
+    else {
+      pageWithAttrs(paramsGetResources).then((res) => {
+        console.log('object个数======>', type)
+        obj.value = res.data.data.records
+        switch (type) {
+          case '组件服务':
+            assignmentMethod('zjNum', res)
+            break
+          case '应用资源':
+            assignmentMethod('yyNum', res)
+            break
+          case '基础设施':
+            assignmentMethod('jcNum', res)
+            break
+          case '知识库':
+            assignmentMethod('zsNum', res)
+            break
+        }
      })
    }
-    window.open(item.link)
-    // window.open(
-    //   window.SITE_CONFIG.previewUrl +
-    //     'hisense_office/onlinePreview?url=' +
-    //     btoa(encodeURI(item.fileHref))
-    // )
  }
-  const assignmentMethod = (type, res) => {
-    object[type] = res.data.data.total
-    // interfaceSuccess.value++
-    // console.log('object个数======>', object, interfaceSuccess.value, type)
-    // if (interfaceSuccess.value >= 4) {
-    //   mybus.emit('chagneNum', object)
-    // }
-  }
-  getAppResources('组件服务', zjList)
-  getAppResources('应用资源', yyList)
-  getAppResources('基础设施', jcList)
-  getAppResources('数据资源', sjList)
-  getAppResources('知识库', zsList)
+}

-  function jumpPage(type) {
-    // 点击内存入store
-    store.commit('home/selectCardsData', {
-      selectCardsnum: type,
-    })
-    console.log(
-      '选中===================>',
-      store.getters['home/selectCardsnum']
-    )
-    // router.push({ path: '/DetailsPageconetent' })
-    router.push({
-      path: '/DetailsPageconetent',
-      query: {
-        select: type,
-      },
-    })
-  }
-  const selectOne = (id) => {
-    console.log('点击===============》', id)
-    router.push({
-      path: '/details',
-      query: {
-        id: id,
-      },
-    })
-  }
-  const selectOne1 = (name) => {
-    router.push({
-      path: '/DetailsPageconetent',
-      query: {
-        type: name,
-        select: '组件服务',
-      },
-    })
-  }
-  const selectOne11 = (name) => {
-    router.push({
-      path: '/DetailsPageconetent',
-      query: {
-        type: name,
-        select: '应用资源',
-      },
-    })
-  }
-  const selectOne2 = (name) => {
-    console.log('点击===============》', name)
-    router.push({
-      path: '/DetailsPageconetent',
-      query: {
-        type: name,
-        select: '基础设施',
-      },
-    })
-  }
-  const selectOne3 = (name) => {
-    console.log('点击===============》', name)
-    router.push({
-      path: '/DetailsPageconetent',
-      query: {
-        str: name,
-        select: '数据资源',
-      },
+// todo 获取无人机、单兵设备
+const getSoldierData = (name) => {
+  let _params = {
+    type: name,
+    page: 1,
+    limit: 10,
+  }
+  return new Promise((resolve, reject) => {
+    getSoldierList(_params)
+      .then((res) => {
+        resolve(res)
+        console.log('res---获取无人机、单兵设备--------->', res)
+        if (res.data.code !== 0) {
+          return message.error(res.data.msg)
+        }
+      })
+      .catch((err) => {
+        reject(err)
+      })
+  })
+}
+
+const openHref = (item) => {
+  console.log(item.id, 'wowowo')
+  console.log(item.visits, 'wowowo')
+  browsingInsert({ resourceId: item.id }).then((res) => {
+    // console.log(res)
+  })
+  const arrList = ref([])
+  arrList.value = JSON.parse(window.sessionStorage.getItem('visits'))
+  if (arrList.value.indexOf(item.id) === -1) {
+    arrList.value.push(item.id)
+    updateVisits({
+      id: item.id,
+      visits: item.visits || '0',
+    }).then(() => {
+      window.sessionStorage.setItem('visits', JSON.stringify(arrList.value))
    })
  }
+  window.open(item.link)
+}
+const assignmentMethod = (type, res) => {
+  object[type] = res.data.data.total
+}
+getAppResources('组件服务', zjList)
+getAppResources('应用资源', yyList)
+getAppResources('基础设施', jcList)
+getAppResources('数据资源', sjList)
+getAppResources('知识库', zsList)
+
+function jumpPage(type) {
+  // 点击内存入store
+  store.commit('home/selectCardsData', {
+    selectCardsnum: type,
+  })
+  console.log(
+    '选中===================>',
+    store.getters['home/selectCardsnum']
+  )
+  // router.push({ path: '/DetailsPageconetent' })
+  router.push({
+    path: '/DetailsPageconetent',
+    query: {
+      select: type,
+    },
+  })
+}
+const selectOne = (id) => {
+  console.log('点击===============》', id)
+  router.push({
+    path: '/details',
+    query: {
+      id: id,
+    },
+  })
+}
+const selectOne1 = (name) => {
+  router.push({
+    path: '/DetailsPageconetent',
+    query: {
+      type: name,
+      select: '组件服务',
+    },
+  })
+}
+const selectOne11 = (name) => {
+  router.push({
+    path: '/DetailsPageconetent',
+    query: {
+      type: name,
+      select: '应用资源',
+    },
+  })
+}
+const selectOne2 = (name) => {
+  console.log('点击===============》', name)
+  router.push({
+    path: '/DetailsPageconetent',
+    query: {
+      type: name,
+      select: '基础设施',
+    },
+  })
+}
+const selectOne3 = (name) => {
+  console.log('点击===============》', name)
+  router.push({
+    path: '/DetailsPageconetent',
+    query: {
+      str: name,
+      select: '数据资源',
+    },
+  })
+}
 </script>
 <style lang="less" scoped>
-  .capability-convergence {
-    height: 7.2rem;
-    background: url('~@/assets/newHome/Convergence-bg.png') no-repeat;
-    background-size: 100%;
-    display: flex;
-    justify-content: center;
+.capability-convergence {
+  height: 7.2rem;
+  background: url('~@/assets/newHome/Convergence-bg.png') no-repeat;
+  background-size: 100%;
+  display: flex;
+  justify-content: center;

-    .main {
-      width: 13rem;
-      margin-top: 1.8rem;
+  .main {
+    width: 13rem;
+    margin-top: 1.8rem;
+    display: flex;
+    flex-direction: column;
+    flex-wrap: wrap;
+
+    .top {
+      font-size: 0.3rem;
+      color: #212121;
+      text-align: center;
      display: flex;
      flex-direction: column;
      flex-wrap: wrap;
+      justify-content: center;
+      align-items: center;

-      .top {
-        font-size: 0.3rem;
-        color: #212121;
-        text-align: center;
-        display: flex;
-        flex-direction: column;
-        flex-wrap: wrap;
-        justify-content: center;
-        align-items: center;
+      .line {
+        width: 0.34rem;
+        height: 0.03rem;
+        background-color: #0058e1;
+        margin-top: 0.08rem;
+      }
+    }

-        .line {
-          width: 0.34rem;
-          height: 0.03rem;
-          background-color: #0058e1;
-          margin-top: 0.08rem;
+    .bottom {
+      display: flex;
+      justify-content: space-between;
+      margin-top: 0.4rem;
+
+      .item {
+        width: 2.44rem;
+        height: 3.91rem;
+        font-size: 0.16rem;
+        background-color: #fff;
+        border-radius: 0.02rem;
+        box-shadow: 0 0.05rem 0.2rem #ccc;
+        position: relative;
+
+        div:nth-of-type(1) {
+          height: 1.02rem;
+          line-height: 1.02rem;
+          font-size: 0.2rem;
+          color: #fff;
+          padding-left: 0.15rem;
+          background-size: 100%;
+        }
+
+        .jc {
+          background: url('~@/assets/newHome/Convergence-jc.png') no-repeat;
+        }
+
+        .sj {
+          background: url('~@/assets/newHome/Convergence-sj.png') no-repeat;
+        }
+
+        .zj {
+          background: url('~@/assets/newHome/Convergence-zj.png') no-repeat;
+        }
+
+        .yy {
+          background: url('~@/assets/newHome/Convergence-yy.png') no-repeat;
+        }
+
+        .zs {
+          background: url('~@/assets/newHome/Convergence-zs.png') no-repeat;
+        }
+
+        .name {
+          height: 0.47rem;
+          line-height: 0.47rem;
+          margin: 0 0.16rem;
+          border-bottom: 0.01rem solid #e9e9e9;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          display: -webkit-box;
+          -webkit-line-clamp: 1;
+          -webkit-box-orient: vertical;
+          word-break: break-all;
+        }
+
+        .name:hover {
+          color: #0058e1;
+          cursor: pointer;
+        }
+
+        .name-last {
+          border-bottom: none;
+        }
+
+        .btn {
+          cursor: pointer;
+          width: 0.8rem;
+          height: 0.24rem;
+          border: 0.01rem solid #0058e1;
+          font-size: 0.14rem;
+          color: #0058e1;
+          border-radius: 0.02rem;
+          text-align: center;
+          margin-top: 0.1rem;
+          margin-left: 0.85rem;
+          position: absolute;
+          bottom: 0.2rem;
+        }
+
+        .btn:hover {
+          background: rgba(0, 88, 225, 0.3);
+          color: #000;
        }
      }

-      .bottom {
-        display: flex;
-        justify-content: space-between;
-        margin-top: 0.4rem;
-
-        .item {
-          width: 2.44rem;
-          height: 3.91rem;
-          font-size: 0.16rem;
-          background-color: #fff;
-          border-radius: 0.02rem;
-          box-shadow: 0 0.05rem 0.2rem #ccc;
-          position: relative;
-
-          div:nth-of-type(1) {
-            height: 1.02rem;
-            line-height: 1.02rem;
-            font-size: 0.2rem;
-            color: #fff;
-            padding-left: 0.15rem;
-            background-size: 100%;
-          }
-
-          .jc {
-            background: url('~@/assets/newHome/Convergence-jc.png') no-repeat;
-          }
-
-          .sj {
-            background: url('~@/assets/newHome/Convergence-sj.png') no-repeat;
-          }
-
-          .zj {
-            background: url('~@/assets/newHome/Convergence-zj.png') no-repeat;
-          }
-
-          .yy {
-            background: url('~@/assets/newHome/Convergence-yy.png') no-repeat;
-          }
-
-          .zs {
-            background: url('~@/assets/newHome/Convergence-zs.png') no-repeat;
-          }
-
-          .name {
-            height: 0.47rem;
-            line-height: 0.47rem;
-            margin: 0 0.16rem;
-            border-bottom: 0.01rem solid #e9e9e9;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            display: -webkit-box;
-            -webkit-line-clamp: 1;
-            -webkit-box-orient: vertical;
-            word-break: break-all;
-          }
-
-          .name:hover {
-            color: #0058e1;
-            cursor: pointer;
-          }
-
-          .name-last {
-            border-bottom: none;
-          }
-
-          .btn {
-            cursor: pointer;
-            width: 0.8rem;
-            height: 0.24rem;
-            border: 0.01rem solid #0058e1;
-            font-size: 0.14rem;
-            color: #0058e1;
-            border-radius: 0.02rem;
-            text-align: center;
-            margin-top: 0.1rem;
-            margin-left: 0.85rem;
-            position: absolute;
-            bottom: 0.2rem;
-          }
-
-          .btn:hover {
-            background: rgba(0, 88, 225, 0.3);
-            color: #000;
-          }
-        }
-
-        .item:hover {
-          border-radius: 0.02rem;
-          border: 0.01rem solid #0058e1;
-          box-shadow: 0rem 0.08rem 0.2rem rgba(0, 88, 225, 0.3);
-        }
+      .item:hover {
+        border-radius: 0.02rem;
+        border: 0.01rem solid #0058e1;
+        box-shadow: 0rem 0.08rem 0.2rem rgba(0, 88, 225, 0.3);
      }
    }
  }
+}
 </style>