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

2022-11-29 17:37:58 +08:00 · 2022-11-29 17:37:58 +08:00 · 2d381d808c
parent a614479f50 3d90e73659
commit 2d381d808c
11 changed files with 415 additions and 301 deletions
--- a/front/src/App.vue
+++ b/front/src/App.vue
@ -2,7 +2,7 @@
 * @Author: hisense.wuhongjian
 * @Date: 2022-05-06 11:12:00
 * @LastEditors: Light
- * @LastEditTime: 2022-11-24 10:53:41
+ * @LastEditTime: 2022-11-29 17:28:20
 * @Description: 告诉大家这是什么
 -->
 <template>
@ -19,13 +19,14 @@
  import { getCategoryTreePage } from '@/api/personalCenter'
  import zhCN from 'ant-design-vue/es/locale/zh_CN'
  import Cookies from 'js-cookie'
-  import { onBeforeUnmount, onMounted, watch, nextTick } from 'vue'
+  import { onBeforeUnmount, onMounted, watch, ref } from 'vue'
  import { useRouter } from 'vue-router'
  import mybus from '@/myplugins/mybus'
  const router = useRouter()

  const locale = zhCN
  const token = Cookies.get('ucsToken')
+  const whoShow1 = ref(whoShow)
  console.log('token=================>', token)
  let ws = new WebSocket(
    `ws://${window.SITE_CONFIG['websocketURL']}/websocket?token=${token}`
@ -39,6 +40,13 @@
    if (router.currentRoute.value.name === 'mynoticeView') {
      mybus.emit('noticeListInit')
    }
+    // 判断当前路由是否是待办列表
+    if (
+      router.currentRoute.value.name === 'DetailsPageconetent' &&
+      whoShow1.value.itShowXiHaiAn
+    ) {
+      mybus.emit('initDetailsPageconetent')
+    }
  }
  ws.onerror = function (e) {
    console.log('WebSocket连接异常============================>', e)
--- a/front/src/store/modules/user.js
+++ b/front/src/store/modules/user.js
@ -2,7 +2,7 @@
 * @author chuzhixin 1204505056@qq.com
 * @description 登录、获取用户信息、退出登录、清除accessToken逻辑，不建议修改
 */
-import { getUserInfo, login, logout } from '@/api/user'
+import { getUserInfo, login, logout, getRole } from '@/api/user'
 import {
  getAccessToken,
  removeAccessToken,
@ -20,6 +20,7 @@ const state = () => ({
  userId: '',
  avatar: '',
  role: 0, // 用户管理员权限
+  roleList: [], // 用户管理员权限
 })
 const getters = {
  accessToken: (state) => state.accessToken,
@ -27,6 +28,7 @@ const getters = {
  realName: (state) => state.realName,
  avatar: (state) => state.avatar,
  role: (state) => state.role,
+  roleList: (state) => state.roleList,
  userId: (state) => state.userId,
  deptName: (state) => state.deptName,
  deptId: (state) => state.deptId,
@ -64,6 +66,9 @@ const mutations = {
  setRole(state, role) {
    state.role = role
  },
+  setRoleList(state, role) {
+    state.roleList = role
+  },
  // 设置用户userId
  setUserId(state, id) {
    state.userId = id
@ -146,6 +151,14 @@ const actions = {
    commit('setUsername', res.data.data.username)
    commit('setRealname', res.data.data.realName)
    commit('setRole', res.data.data.roleIdList.length)
+    // 获取角色数据
+    const roleArr = []
+    res.data.data.roleIdList.map((val) => {
+      getRole(val).then((role) => {
+        roleArr.push(role.data.data.name)
+      })
+    })
+    commit('setRoleList', roleArr)
    commit('setUserId', res.data.data.id)
    commit('setDeptName', res.data.data.deptName)
    commit('setDeptId', res.data.data.deptId)
@ -181,7 +194,6 @@ const actions = {
   * @param {*} { commit, dispatch }
   */
  async resetAll({ dispatch }) {
- 
    await dispatch('setAccessToken', '')
    await dispatch('acl/setFull', false, {
      root: true,
--- a/front/src/views/capacitySquare/components/algorithm.vue
+++ b/front/src/views/capacitySquare/components/algorithm.vue
@ -22,7 +22,11 @@
        </div>
        <div class="bottom" v-show="selectFlag2">
          <span class="light"></span>
-          <div v-for="val in dictList" :key="val" @click="changeAreaFunction(val)">
+          <div
+            v-for="val in dictList"
+            :key="val"
+            @click="changeAreaFunction(val)"
+          >
            {{ val }}
          </div>
        </div>
@ -30,9 +34,18 @@
    </div>

    <div class="algorithm-class">
-      <div v-for="(item, index) in dataList" :key="`algorithm-${index}`" class="algorithm-card">
-        <a-image :src="algorithmCardPhoto(item)" :width="525" :height="275" :fallback="imgSrc" :preview="false">
-        </a-image>
+      <div
+        v-for="(item, index) in dataList"
+        :key="`algorithm-${index}`"
+        class="algorithm-card"
+      >
+        <a-image
+          :src="algorithmCardPhoto(item)"
+          :width="525"
+          :height="275"
+          :fallback="imgSrc"
+          :preview="false"
+        ></a-image>

        <a-tooltip>
          <template #title>{{ item.name }}</template>
@ -49,11 +62,15 @@
  import { getCategoryTreePage } from '@/api/personalCenter'
  import { getGisByArea } from '@/api/home'
  import { ref, onMounted, onBeforeUnmount, nextTick } from 'vue'
-
-
+  import { useRouter } from 'vue-router'
+  const router = useRouter()
+  const area = router.currentRoute.value.query.area
  const deptType = ref(null)
  const typeName = ref('全市')
  const typeName2 = ref('全部')
+  if (area) {
+    typeName2.value = area
+  }
  const dictList = ref([])
  const dataList = ref([])
  const selectFlag2 = ref(false)
@ -74,14 +91,14 @@ const params = {
    pageNum: 1,
    type: '智能算法',
    area: typeName2.value == '全部' ? '' : typeName2.value,
-  pageSize: 9 // 固定9
+    pageSize: 9, // 固定9
  }

  // 切换领域
  const changeAreaFunction = (val) => {
-  params.pageNum = 1;
+    params.pageNum = 1
    typeName2.value = val
-  params.area = typeName2.value == '全部' ? '' : typeName2.value;
+    params.area = typeName2.value == '全部' ? '' : typeName2.value
    selectFlag2.value = false
    pageWithAttrsFunction()
  }
@ -106,8 +123,8 @@ const algorithmCardPhoto = (item) => {
    if (item.pic && typeof item.pic == 'string') {
      _arr = JSON.parse(item.pic)
    }
-  let _img = _arr[0] && _arr[0].img || imgSrc.value;
-  console.log('_img------------>', _img);
+    let _img = (_arr[0] && _arr[0].img) || imgSrc.value
+    console.log('_img------------>', _img)
    return _img
  }
  //跳转详情页
@ -141,7 +158,7 @@ const algorithmFunction = (e) => {
  const changeDeptType = (str) => {
    if (str) {
      if (algorithmclassDom) {
-      algorithmclassDom.scrollTop = 0;
+        algorithmclassDom.scrollTop = 0
      }
      switch (str) {
        case '全市':
@ -161,9 +178,9 @@ const changeDeptType = (str) => {
          typeName.value = '企 业'
          break
      }
-    params.pageNum = 1;
+      params.pageNum = 1
      if (deptType.value !== null && deptType.value !== undefined) {
-      params.deptType = deptType.value;
+        params.deptType = deptType.value
      } else {
        if (Object.keys(params).includes('deptType')) {
          delete params.deptType
@ -177,14 +194,22 @@ const changeDeptType = (str) => {
  const getData = (str) => {
    getGisByArea(params).then((res) => {
      const resData = res.data.data || {}
-    if (resData.list.length > 0 && resData.list.length < 9 && algorithmclassDom) {
+      if (
+        resData.list.length > 0 &&
+        resData.list.length < 9 &&
+        algorithmclassDom
+      ) {
        algorithmclassDom.removeEventListener('scroll', algorithmFunction, true)
      }
      dataList.value = resData.list || []
      nextTick(() => {
        algorithmclassDom = document.querySelector('.algorithm-box')
        if (str && algorithmclassDom) {
-        algorithmclassDom.removeEventListener('scroll', algorithmFunction, true)
+          algorithmclassDom.removeEventListener(
+            'scroll',
+            algorithmFunction,
+            true
+          )
          algorithmclassDom.addEventListener('scroll', algorithmFunction, true)
        }
      })
@ -229,7 +254,8 @@ onBeforeUnmount(() => {
          position: absolute;
          top: 0.4rem;
          left: 1.52rem;
-        background: url('~@/assets/capacitySquare/select-light1.png') no-repeat;
+          background: url('~@/assets/capacitySquare/select-light1.png')
+            no-repeat;
          background-size: 100%;
        }
      }
@ -250,7 +276,8 @@ onBeforeUnmount(() => {
          position: absolute;
          top: -0.08rem;
          left: -0.3rem;
-        background: url('~@/assets/capacitySquare/select-light2.png') no-repeat;
+          background: url('~@/assets/capacitySquare/select-light2.png')
+            no-repeat;
          background-size: 100%;
        }

@ -299,7 +326,8 @@ onBeforeUnmount(() => {
        .algorithm-card-photo {
          height: 100%;
          width: 100%;
-        background: url('~@/assets/capacitySquare/algorithm-photo.jpg') no-repeat;
+          background: url('~@/assets/capacitySquare/algorithm-photo.jpg')
+            no-repeat;
          background-size: 100%;
        }

@ -313,7 +341,8 @@ onBeforeUnmount(() => {
          font-family: alibaba;
          bottom: 0.15rem;
          padding-left: 0.22rem;
-        background: url('~@/assets/capacitySquare/algorithm-title-bg.png') no-repeat;
+          background: url('~@/assets/capacitySquare/algorithm-title-bg.png')
+            no-repeat;
          background-size: 100%;
          display: flex;
          flex-direction: column;
--- a/front/src/views/capacitySquare/components/application.vue
+++ b/front/src/views/capacitySquare/components/application.vue
@ -1,8 +1,8 @@
 <!--
 * @Author: hisense.liangjunhua
 * @Date: 2022-08-09 09:31:25
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-24 10:44:50
+ * @LastEditors: Light
+ * @LastEditTime: 2022-11-29 14:41:49
 * @Description: 应用资源
 -->
 <template>
@ -57,12 +57,17 @@
  import { selectAppList } from '@/api/home'
  import { useRouter } from 'vue-router'
  const router = useRouter()
+  const selectArea = router.currentRoute.value.query.area
  const pageNum = ref(1)
  const flag = ref(true)
  const type = ref(null)
  const area = ref(null)
  const typeName = ref('全市')
  const typeName2 = ref('全部')
+  if (selectArea && selectArea !== '全部') {
+    typeName2.value = selectArea
+    area.value = selectArea
+  }
  const dictList = ref([])
  const data = reactive({ list: [] })
  const selectFlag = ref(false)
@ -121,7 +126,7 @@
      type: type.value,
      area: area.value,
    }).then((res) => {
-      console.log('res---应用广场--------->', res);
+      console.log('res---应用广场--------->', res)

      if (res.data.data.total.length < 9) {
        dom.removeEventListener('scroll', viewMonitor, true)
--- a/front/src/views/capacitySquare/components/layer.vue
+++ b/front/src/views/capacitySquare/components/layer.vue
@ -60,9 +60,15 @@
  import { getCategoryTreePage } from '@/api/personalCenter'
  import { getGisByArea } from '@/api/home'
  import { ref, onMounted, onBeforeUnmount, nextTick } from 'vue'
+  import { useRouter } from 'vue-router'
+  const router = useRouter()
+  const area = router.currentRoute.value.query.area
  const deptType = ref(null)
  const typeName = ref('全市')
  const typeName2 = ref('全部')
+  if (area) {
+    typeName2.value = area
+  }
  const dictList = ref([])
  const dataList = ref([])
  const selectFlag2 = ref(false)
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue
@ -8,8 +8,7 @@
      ></DetalsTitle>
    </div>
    <!-- 青岛市局 -->
-    <div style="width: 100%; display: flex; justify-content: center"
-    >
+    <div style="width: 100%; display: flex; justify-content: center">
      <div class="content" v-for="item in dataFrom.content" :key="item.title">
        <div class="content-left" v-if="item.titleType === '调用接口'">
          <div class="left">
@ -97,12 +96,14 @@
                <a-tooltip>
                  <template #title>
                    {{
-                      approveStatus === '通过'
+                      approveStatus === '通过' || role
                        ? item.people.value
                        : '请申请后查看'
                    }}
                  </template>
-                  <span :class="{ 'blur-word': approveStatus !== '通过' }">
+                  <span
+                    :class="{ 'blur-word': approveStatus !== '通过' && !role }"
+                  >
                    {{ item.people.value }}
                  </span>
                </a-tooltip>
@ -112,12 +113,14 @@
                <a-tooltip>
                  <template #title>
                    {{
-                      approveStatus === '通过'
+                      approveStatus === '通过' || role
                        ? item.phone.value
                        : '请申请后查看'
                    }}
                  </template>
-                  <span :class="{ 'blur-word': approveStatus !== '通过' }">
+                  <span
+                    :class="{ 'blur-word': approveStatus !== '通过' && !role }"
+                  >
                    {{ item.phone.value }}
                  </span>
                </a-tooltip>
@ -169,7 +172,15 @@
  import { ref, defineProps, watch } from 'vue'
  import { message } from 'ant-design-vue'
  import { useRouter } from 'vue-router'
+  import { useStore } from 'vuex'
  const router = useRouter()
+  const store = useStore()
+  const role = ref(false)
+  store.getters['user/roleList'].map((val) => {
+    if (val === '运维管理员') {
+      role.value = true
+    }
+  })

  const approveStatus = ref('通过')
  const whoShow1 = ref(whoShow)
--- a/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue
@ -8,8 +8,7 @@
      ></DetalsTitle>
    </div>
    <!-- 青岛市局 -->
-    <div style="width: 100%; display: flex; justify-content: center"
-    >
+    <div style="width: 100%; display: flex; justify-content: center">
      <div class="content">
        <div
          v-for="(item, index) in dataFrom.content"
@ -24,6 +23,7 @@
                <a-tooltip
                  v-if="
                    approveStatus !== '通过' &&
+                    !role &&
                    (carditem.attrType === '联系人' ||
                      carditem.attrType === '联系人电话')
                  "
@ -55,7 +55,15 @@
  import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
  import { ref, defineProps, watch } from 'vue'
  import { useRouter } from 'vue-router'
+  import { useStore } from 'vuex'
  const router = useRouter()
+  const store = useStore()
+  const role = ref(false)
+  store.getters['user/roleList'].map((val) => {
+    if (val === '运维管理员') {
+      role.value = true
+    }
+  })
  const approveStatus = ref('通过')
  const whoShow1 = ref(whoShow)
  let dataFrom = ref({
--- a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue
+++ b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue
@ -7,8 +7,7 @@
        :type="dataFrom.englishTitle"
      ></DetalsTitle>
    </div>
-    <div style="width: 100%; display: flex; justify-content: center"
-    >
+    <div style="width: 100%; display: flex; justify-content: center">
      <div class="content" v-for="item in dataFrom.content" :key="item.title">
        <div class="content-left">
          <div class="left">
@ -52,12 +51,14 @@
                <a-tooltip>
                  <template #title>
                    {{
-                      approveStatus === '通过'
+                      approveStatus === '通过' || role
                        ? item.people.value
                        : '请申请后查看'
                    }}
                  </template>
-                  <span :class="{ 'blur-word': approveStatus !== '通过' }">
+                  <span
+                    :class="{ 'blur-word': approveStatus !== '通过' && !role }"
+                  >
                    {{ item.people.value }}
                  </span>
                </a-tooltip>
@ -67,12 +68,14 @@
                <a-tooltip>
                  <template #title>
                    {{
-                      approveStatus === '通过'
+                      approveStatus === '通过' || role
                        ? item.phone.value
                        : '请申请后查看'
                    }}
                  </template>
-                  <span :class="{ 'blur-word': approveStatus !== '通过' }">
+                  <span
+                    :class="{ 'blur-word': approveStatus !== '通过' && !role }"
+                  >
                    {{ item.phone.value }}
                  </span>
                </a-tooltip>
@ -124,7 +127,15 @@
  import { ref, defineProps, watch } from 'vue'
  import { message } from 'ant-design-vue'
  import { useRouter } from 'vue-router'
+  import { useStore } from 'vuex'
  const router = useRouter()
+  const store = useStore()
+  const role = ref(false)
+  store.getters['user/roleList'].map((val) => {
+    if (val === '运维管理员') {
+      role.value = true
+    }
+  })
  const approveStatus = ref('通过')
  const whoShow1 = ref(whoShow)
  let dataFrom = ref({
--- a/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue
+++ b/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue
@ -7,8 +7,7 @@
        :type="dataFrom.englishTitle"
      ></DetalsTitle>
    </div>
-    <div style="width: 100%; display: flex; justify-content: center"
-    >
+    <div style="width: 100%; display: flex; justify-content: center">
      <div class="content">
        <div class="content-card">
          <div class="left">
@ -40,6 +39,7 @@
                    <template #title>
                      {{
                        approveStatus !== '通过' &&
+                        !role &&
                        (carditem.attrType === '部门联系人' ||
                          carditem.attrType === '联系人电话')
                          ? '请申请后查看'
@ -50,6 +50,7 @@
                      :class="{
                        'blur-word':
                          approveStatus !== '通过' &&
+                          !role &&
                          (carditem.attrType === '部门联系人' ||
                            carditem.attrType === '联系人电话'),
                      }"
@ -80,7 +81,15 @@
  import { pinyin } from 'pinyin-pro'
  import { message } from 'ant-design-vue'
  import { useRouter } from 'vue-router'
+  import { useStore } from 'vuex'
  const router = useRouter()
+  const store = useStore()
+  const role = ref(false)
+  store.getters['user/roleList'].map((val) => {
+    if (val === '运维管理员') {
+      role.value = true
+    }
+  })
  const approveStatus = ref('通过')
  const whoShow1 = ref(whoShow)
  let flag = ref(true)
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
@ -7,8 +7,7 @@
        :type="dataFrom.englishTitle"
      ></DetalsTitle>
    </div>
-    <div style="width: 100%; display: flex; justify-content: center"
-    >
+    <div style="width: 100%; display: flex; justify-content: center">
      <div class="content" v-for="item in dataFrom.content" :key="item.title">
        <div class="content-left">
          <div class="left">
@ -63,12 +62,14 @@
                <a-tooltip>
                  <template #title>
                    {{
-                      approveStatus === '通过'
+                      approveStatus === '通过' || role
                        ? item.people.value
                        : '请申请后查看'
                    }}
                  </template>
-                  <span :class="{ 'blur-word': approveStatus !== '通过' }">
+                  <span
+                    :class="{ 'blur-word': approveStatus !== '通过' && !role }"
+                  >
                    {{ item.people.value }}
                  </span>
                </a-tooltip>
@ -78,12 +79,14 @@
                <a-tooltip>
                  <template #title>
                    {{
-                      approveStatus === '通过'
+                      approveStatus === '通过' || role
                        ? item.phone.value
                        : '请申请后查看'
                    }}
                  </template>
-                  <span :class="{ 'blur-word': approveStatus !== '通过' }">
+                  <span
+                    :class="{ 'blur-word': approveStatus !== '通过' && !role }"
+                  >
                    {{ item.phone.value }}
                  </span>
                </a-tooltip>
@ -135,7 +138,15 @@
  import { pinyin } from 'pinyin-pro'
  import { ref, defineProps, watch } from 'vue'
  import { useRouter } from 'vue-router'
+  import { useStore } from 'vuex'
  const router = useRouter()
+  const store = useStore()
+  const role = ref(false)
+  store.getters['user/roleList'].map((val) => {
+    if (val === '运维管理员') {
+      role.value = true
+    }
+  })
  const approveStatus = ref('通过')
  const whoShow1 = ref(whoShow)
  let dataFrom = ref({
--- a/front/src/views/home/infrastructureApplication.vue
+++ b/front/src/views/home/infrastructureApplication.vue
@ -2,7 +2,7 @@
 * @Author: Light
 * @Date: 2022-11-18 11:53:43
 * @LastEditors: Light
- * @LastEditTime: 2022-11-29 11:50:25
+ * @LastEditTime: 2022-11-29 17:28:02
 * @Description: 告诉大家这是什么
 -->
 <template>
@ -447,8 +447,12 @@
      }
    }
  })
+  mybus.on('initDetailsPageconetent', () => {
+    initApply()
+  })
  onBeforeUnmount(() => {
    mybus.off('selectCamera')
+    mybus.off('initDetailsPageconetent')
  })
 </script>
 <style lang="less" scoped>