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

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)

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,

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">
+      <div
-        <a-image :src="algorithmCardPhoto(item)" :width="525" :height="275" :fallback="imgSrc" :preview="false">
+        v-for="(item, index) in dataList"
-        </a-image>
+        :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>
@@ -46,308 +59,324 @@
   </div>
 </template>
 <script setup>
-import { getCategoryTreePage } from '@/api/personalCenter'
+  import { getCategoryTreePage } from '@/api/personalCenter'
-import { getGisByArea } from '@/api/home'
+  import { getGisByArea } from '@/api/home'
-import { ref, onMounted, onBeforeUnmount, nextTick } from 'vue'
+  import { ref, onMounted, onBeforeUnmount, nextTick } from 'vue'
-
+  import { useRouter } from 'vue-router'
-
+  const router = useRouter()
-const deptType = ref(null)
+  const area = router.currentRoute.value.query.area
-const typeName = ref('全市')
+  const deptType = ref(null)
-const typeName2 = ref('全部')
+  const typeName = ref('全市')
-const dictList = ref([])
+  const typeName2 = ref('全部')
-const dataList = ref([])
+  if (area) {
-const selectFlag2 = ref(false)
+    typeName2.value = area
-const selectFlag = ref(false)
-getCategoryTreePage({
-  page: 1,
-  limit: 99,
-  dictTypeId: '1513712507692818433',
-}).then((res) => {
-  dictList.value = ['全部']
-  res.data.data.list.map((val) => {
-    // if (val.dictLabel !== '其他') {
-    dictList.value.push(val.dictLabel)
-    // }
-  })
-})
-const params = {
-  pageNum: 1,
-  type: '智能算法',
-  area: typeName2.value == '全部' ? '' : typeName2.value,
-  pageSize: 9 // 固定9
-}
-
-// 切换领域
-const changeAreaFunction = (val) => {
-  params.pageNum = 1;
-  typeName2.value = val
-  params.area = typeName2.value == '全部' ? '' : typeName2.value;
-  selectFlag2.value = false
-  pageWithAttrsFunction()
-}
-let algorithmclassDom = null
-const imgSrc = ref(require('@/assets/capacitySquare/algorithm-photo.jpg'))
-const dataLength = ref(true)
-const isNoMore = ref(false)
-let url = ref('')
-const pageWithAttrsFunction = () => {
-  getGisByArea(params).then((res) => {
-    dataList.value = res.data.data.list
-    if (res.data.data.list.length < 9) {
-      dataLength.value = false
-    }
-  })
-}
-pageWithAttrsFunction()
-
-//图片显示
-const algorithmCardPhoto = (item) => {
-  let _arr = []
-  if(item.pic && typeof item.pic == 'string') {
-    _arr = JSON.parse(item.pic)
   }
-  let _img = _arr[0] && _arr[0].img || imgSrc.value;
+  const dictList = ref([])
-  console.log('_img------------>', _img);
+  const dataList = ref([])
-  return _img
+  const selectFlag2 = ref(false)
-}
+  const selectFlag = ref(false)
-//跳转详情页
+  getCategoryTreePage({
-const detailFunction = (id) => {
+    page: 1,
-  window.open(window.SITE_CONFIG.previewUrl + `#/details?id=${id}`)
+    limit: 99,
-}
+    dictTypeId: '1513712507692818433',
-const algorithmFunction = (e) => {
+  }).then((res) => {
-  var scrollTop = e.currentTarget.scrollTop
+    dictList.value = ['全部']
-  var windowHeight = e.currentTarget.clientHeight
+    res.data.data.list.map((val) => {
-  var scrollHeight = e.currentTarget.scrollHeight
+      // if (val.dictLabel !== '其他') {
-  console.log(scrollTop, windowHeight, scrollHeight, '123')
+      dictList.value.push(val.dictLabel)
-  if (
+      // }
-    scrollTop + windowHeight <= scrollHeight + 1 &&
+    })
-    scrollTop + windowHeight >= scrollHeight - 1
+  })
-  ) {
+  const params = {
-    // 当前滚动条已经触底
+    pageNum: 1,
-    isNoMore.value = true
+    type: '智能算法',
-    params.pageNum++
+    area: typeName2.value == '全部' ? '' : typeName2.value,
+    pageSize: 9, // 固定9
+  }
+
+  // 切换领域
+  const changeAreaFunction = (val) => {
+    params.pageNum = 1
+    typeName2.value = val
+    params.area = typeName2.value == '全部' ? '' : typeName2.value
+    selectFlag2.value = false
+    pageWithAttrsFunction()
+  }
+  let algorithmclassDom = null
+  const imgSrc = ref(require('@/assets/capacitySquare/algorithm-photo.jpg'))
+  const dataLength = ref(true)
+  const isNoMore = ref(false)
+  let url = ref('')
+  const pageWithAttrsFunction = () => {
     getGisByArea(params).then((res) => {
-      dataList.value.push(...res.data.data.list)
+      dataList.value = res.data.data.list
       if (res.data.data.list.length < 9) {
         dataLength.value = false
       }
     })
-  } else {
-    isNoMore.value = false
   }
-}
+  pageWithAttrsFunction()
 
-// 切换区市
+  //图片显示
-const changeDeptType = (str) => {
+  const algorithmCardPhoto = (item) => {
-  if (str) {
+    let _arr = []
-    if (algorithmclassDom) {
+    if (item.pic && typeof item.pic == 'string') {
-      algorithmclassDom.scrollTop = 0;
+      _arr = JSON.parse(item.pic)
     }
-    switch (str) {
+    let _img = (_arr[0] && _arr[0].img) || imgSrc.value
-      case '全市':
+    console.log('_img------------>', _img)
-        deptType.value = null
+    return _img
-        typeName.value = '全 市'
+  }
-        break
+  //跳转详情页
-      case '市级':
+  const detailFunction = (id) => {
-        deptType.value = 2
+    window.open(window.SITE_CONFIG.previewUrl + `#/details?id=${id}`)
-        typeName.value = '市 级'
+  }
-        break
+  const algorithmFunction = (e) => {
-      case '区级':
+    var scrollTop = e.currentTarget.scrollTop
-        deptType.value = 3
+    var windowHeight = e.currentTarget.clientHeight
-        typeName.value = '区 级'
+    var scrollHeight = e.currentTarget.scrollHeight
-        break
+    console.log(scrollTop, windowHeight, scrollHeight, '123')
-      case '企业':
+    if (
-        deptType.value = 4
+      scrollTop + windowHeight <= scrollHeight + 1 &&
-        typeName.value = '企 业'
+      scrollTop + windowHeight >= scrollHeight - 1
-        break
+    ) {
+      // 当前滚动条已经触底
+      isNoMore.value = true
+      params.pageNum++
+      getGisByArea(params).then((res) => {
+        dataList.value.push(...res.data.data.list)
+        if (res.data.data.list.length < 9) {
+          dataLength.value = false
+        }
+      })
+    } else {
+      isNoMore.value = false
     }
-    params.pageNum = 1;
+  }
-    if(deptType.value !== null && deptType.value !== undefined) {
+
-      params.deptType = deptType.value;
+  // 切换区市
-    }else {
+  const changeDeptType = (str) => {
-      if(Object.keys(params).includes('deptType')) {
+    if (str) {
-        delete params.deptType
+      if (algorithmclassDom) {
+        algorithmclassDom.scrollTop = 0
+      }
+      switch (str) {
+        case '全市':
+          deptType.value = null
+          typeName.value = '全 市'
+          break
+        case '市级':
+          deptType.value = 2
+          typeName.value = '市 级'
+          break
+        case '区级':
+          deptType.value = 3
+          typeName.value = '区 级'
+          break
+        case '企业':
+          deptType.value = 4
+          typeName.value = '企 业'
+          break
+      }
+      params.pageNum = 1
+      if (deptType.value !== null && deptType.value !== undefined) {
+        params.deptType = deptType.value
+      } else {
+        if (Object.keys(params).includes('deptType')) {
+          delete params.deptType
+        }
       }
     }
+    selectFlag.value = false
+    getData(str)
   }
-  selectFlag.value = false
-  getData(str)
-}
 
-const getData = (str) => {
+  const getData = (str) => {
-  getGisByArea(params).then((res) => {
+    getGisByArea(params).then((res) => {
-    const resData = res.data.data || {}
+      const resData = res.data.data || {}
-    if (resData.list.length > 0 && resData.list.length < 9 && algorithmclassDom) {
+      if (
-      algorithmclassDom.removeEventListener('scroll', algorithmFunction, true)
+        resData.list.length > 0 &&
-    }
+        resData.list.length < 9 &&
-    dataList.value = resData.list || []
+        algorithmclassDom
-    nextTick(() => {
+      ) {
-      algorithmclassDom = document.querySelector('.algorithm-box')
-      if (str && algorithmclassDom) {
         algorithmclassDom.removeEventListener('scroll', algorithmFunction, true)
-        algorithmclassDom.addEventListener('scroll', algorithmFunction, true)
       }
+      dataList.value = resData.list || []
+      nextTick(() => {
+        algorithmclassDom = document.querySelector('.algorithm-box')
+        if (str && algorithmclassDom) {
+          algorithmclassDom.removeEventListener(
+            'scroll',
+            algorithmFunction,
+            true
+          )
+          algorithmclassDom.addEventListener('scroll', algorithmFunction, true)
+        }
+      })
     })
-  })
-}
-
-onMounted(() => {
-  algorithmclassDom = document.querySelector('.algorithm-class')
-  if (dataLength.value) {
-    //监听滚动事件
-    algorithmclassDom.addEventListener('scroll', algorithmFunction, true)
   }
-})
+
-onBeforeUnmount(() => {
+  onMounted(() => {
-  algorithmclassDom.removeEventListener('scroll', algorithmFunction, true)
+    algorithmclassDom = document.querySelector('.algorithm-class')
-})
+    if (dataLength.value) {
+      //监听滚动事件
+      algorithmclassDom.addEventListener('scroll', algorithmFunction, true)
+    }
+  })
+  onBeforeUnmount(() => {
+    algorithmclassDom.removeEventListener('scroll', algorithmFunction, true)
+  })
 </script>
 
 <style lang="less" scoped>
-.algorithm {
+  .algorithm {
-  .select {
+    .select {
-    margin: 0.1rem 0 0.1rem 0.2rem;
+      margin: 0.1rem 0 0.1rem 0.2rem;
-    color: #fff;
+      color: #fff;
-    font-size: 0.2rem;
+      font-size: 0.2rem;
-    font-family: webfont;
+      font-family: webfont;
-    position: relative;
-
-    .top {
-      cursor: pointer;
-      width: 3.61rem;
-      height: 0.85rem;
-      font-weight: 600;
-      text-align: center;
-      padding-top: 0.1rem;
-      background: url('~@/assets/capacitySquare/select-bg.png') no-repeat;
-      background-size: 100%;
       position: relative;
 
-      .light {
+      .top {
-        width: 0.56rem;
+        cursor: pointer;
-        height: 3px;
+        width: 3.61rem;
-        position: absolute;
+        height: 0.85rem;
-        top: 0.4rem;
+        font-weight: 600;
-        left: 1.52rem;
-        background: url('~@/assets/capacitySquare/select-light1.png') no-repeat;
-        background-size: 100%;
-      }
-    }
-
-    .bottom {
-      cursor: pointer;
-      position: absolute;
-      top: 0.5rem;
-      left: 0.9rem;
-      z-index: 1000;
-      background: rgba(57, 134, 239, 0.68);
-      border: 1px solid #aed5ff;
-
-      .light {
-        display: inline-block;
-        width: 2.39rem;
-        height: 5px;
-        position: absolute;
-        top: -0.08rem;
-        left: -0.3rem;
-        background: url('~@/assets/capacitySquare/select-light2.png') no-repeat;
-        background-size: 100%;
-      }
-
-      &>div {
-        width: 1.8rem;
-        height: 0.4rem;
-        line-height: 0.4rem;
         text-align: center;
-        border-top: 1px solid #aed5ff;
+        padding-top: 0.1rem;
-      }
+        background: url('~@/assets/capacitySquare/select-bg.png') no-repeat;
+        background-size: 100%;
+        position: relative;
 
-      &>div:nth-of-type(1) {
+        .light {
-        border: none;
+          width: 0.56rem;
-      }
+          height: 3px;
-    }
+          position: absolute;
-  }
+          top: 0.4rem;
-
+          left: 1.52rem;
-  .algorithm-class {
+          background: url('~@/assets/capacitySquare/select-light1.png')
-    // margin-top: 0.6rem;
+            no-repeat;
-    margin-bottom: 0.18rem;
+          background-size: 100%;
-    display: grid;
-    grid-template-columns: repeat(3, 33%);
-    height: 8.8rem;
-    overflow: auto;
-    margin-left: 1.15rem;
-    margin-right: 0.15rem;
-
-    .algorithm-card {
-      height: 2.75rem;
-      width: 5.25rem;
-      background: url('~@/assets/capacitySquare/algorithm-bg.png') no-repeat;
-      background-size: 100% 100%;
-      margin-bottom: 0.4rem;
-      margin-right: 0.65rem;
-      position: relative;
-
-      :deep(.ant-image) {
-        img {
-          margin-top: 0.15rem;
-          height: 2.45rem;
-          width: 5.05rem;
-          margin-left: 0.1rem;
         }
       }
 
-      .algorithm-card-photo {
+      .bottom {
-        height: 100%;
+        cursor: pointer;
-        width: 100%;
-        background: url('~@/assets/capacitySquare/algorithm-photo.jpg') no-repeat;
-        background-size: 100%;
-      }
-
-      .algorithm-card-title {
         position: absolute;
-        height: 0.6rem;
+        top: 0.5rem;
-        margin-left: 0.08rem;
+        left: 0.9rem;
-        width: 97%;
+        z-index: 1000;
-        color: #ffffff;
+        background: rgba(57, 134, 239, 0.68);
-        font-size: 0.22rem;
+        border: 1px solid #aed5ff;
-        font-family: alibaba;
-        bottom: 0.15rem;
-        padding-left: 0.22rem;
-        background: url('~@/assets/capacitySquare/algorithm-title-bg.png') no-repeat;
-        background-size: 100%;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
 
-        span {
+        .light {
-          line-height: 0.24rem;
+          display: inline-block;
-          overflow: hidden;
+          width: 2.39rem;
-          text-overflow: ellipsis;
+          height: 5px;
-          white-space: nowrap;
+          position: absolute;
-          cursor: pointer;
+          top: -0.08rem;
+          left: -0.3rem;
+          background: url('~@/assets/capacitySquare/select-light2.png')
+            no-repeat;
+          background-size: 100%;
         }
 
-        span:last-child {
+        & > div {
-          font-size: 0.14rem;
+          width: 1.8rem;
+          height: 0.4rem;
+          line-height: 0.4rem;
+          text-align: center;
+          border-top: 1px solid #aed5ff;
+        }
+
+        & > div:nth-of-type(1) {
+          border: none;
         }
       }
     }
-  }
 
-  .algorithm-class::-webkit-scrollbar-track-piece {
+    .algorithm-class {
-    background: #a5bcdb;
+      // margin-top: 0.6rem;
-    border-radius: 0.08rem;
+      margin-bottom: 0.18rem;
-  }
+      display: grid;
+      grid-template-columns: repeat(3, 33%);
+      height: 8.8rem;
+      overflow: auto;
+      margin-left: 1.15rem;
+      margin-right: 0.15rem;
 
-  .algorithm-class::-webkit-scrollbar-thumb {
+      .algorithm-card {
-    height: 3.2rem;
+        height: 2.75rem;
-    background: linear-gradient(to bottom, #47d7f5, #3dc6e3);
+        width: 5.25rem;
-  }
+        background: url('~@/assets/capacitySquare/algorithm-bg.png') no-repeat;
+        background-size: 100% 100%;
+        margin-bottom: 0.4rem;
+        margin-right: 0.65rem;
+        position: relative;
 
-  .algorithm-class::-webkit-scrollbar {
+        :deep(.ant-image) {
-    height: 8.8rem;
+          img {
-    width: 0.08rem;
+            margin-top: 0.15rem;
-    border-radius: 0.08rem;
+            height: 2.45rem;
+            width: 5.05rem;
+            margin-left: 0.1rem;
+          }
+        }
+
+        .algorithm-card-photo {
+          height: 100%;
+          width: 100%;
+          background: url('~@/assets/capacitySquare/algorithm-photo.jpg')
+            no-repeat;
+          background-size: 100%;
+        }
+
+        .algorithm-card-title {
+          position: absolute;
+          height: 0.6rem;
+          margin-left: 0.08rem;
+          width: 97%;
+          color: #ffffff;
+          font-size: 0.22rem;
+          font-family: alibaba;
+          bottom: 0.15rem;
+          padding-left: 0.22rem;
+          background: url('~@/assets/capacitySquare/algorithm-title-bg.png')
+            no-repeat;
+          background-size: 100%;
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+
+          span {
+            line-height: 0.24rem;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            cursor: pointer;
+          }
+
+          span:last-child {
+            font-size: 0.14rem;
+          }
+        }
+      }
+    }
+
+    .algorithm-class::-webkit-scrollbar-track-piece {
+      background: #a5bcdb;
+      border-radius: 0.08rem;
+    }
+
+    .algorithm-class::-webkit-scrollbar-thumb {
+      height: 3.2rem;
+      background: linear-gradient(to bottom, #47d7f5, #3dc6e3);
+    }
+
+    .algorithm-class::-webkit-scrollbar {
+      height: 8.8rem;
+      width: 0.08rem;
+      border-radius: 0.08rem;
+    }
   }
-}
 </style>

front/src/views/capacitySquare/components/application.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-08-09 09:31:25
- * @LastEditors: hisense.wuhongjian
+ * @LastEditors: Light
- * @LastEditTime: 2022-10-24 10:44:50
+ * @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,8 +126,8 @@
       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)
       }

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)
@@ -337,4 +343,4 @@
       border-radius: 0.08rem;
     }
   }
-</style>
+</style>

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)

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({

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({

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)

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({

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>