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

back/public/config/basicConfig.js

@@ -7,8 +7,8 @@
  */
 var _global = {}
 var CONFIGITEM = {
-  // version: 'qingdao', // 青岛
-  version: 'xihaian', // 西海岸
+  version: 'qingdao', // 青岛
+  // version: 'xihaian', // 西海岸
   // version: 'test', // 测试
   // version: 'frp', // 内网穿透
   // version: 'dev', // 开发

back/src/utils/location.js

@@ -1,13 +1,12 @@
 /*
- * @Author: hisense.liangjunhua
+ * @Author: hisense.guoyue
  * @Date: 2022-08-23 10:30:11
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-09-01 16:06:05
- * @Description: 告诉大家这是什么
+ * @LastEditors: hisense.guoyue
+ * @LastEditTime: 2022-10-02 14:47:05
+ * @Description: 判断当前环境是西海岸还是青岛市局
  */
 const returnLocationStr = () => {
-  // return 'qingdao'
-  return 'xihaian'
+  return CONFIGITEM.version
 }
 
 export default returnLocationStr

back/src/views/modules/workBench/workBench.vue

@@ -55,7 +55,8 @@ export default {
         num: 0,
         list: [],
         type: 'todo',
-        url: 'activiti-my-todo-task'
+        // url: 'activiti-my-todo-task',
+        url: 'myAgent-CompetencyApplication',
       },
       // 部门已办
       hasToDodoData: {
@@ -67,7 +68,8 @@ export default {
         textColor: '#21b107',
         num: 0,
         list: [],
-        url: 'activiti-my-join-task'
+        // url: 'activiti-my-join-task',
+        url: 'hasToDoTasks-CompetencyApplication',
       },
       // 部门申请
       resourceData: [],

front/src/views/abilityStatistics/components/AbilityTotal.vue

@@ -39,7 +39,9 @@
   ///whole_amount接口
   function snum() {
     totalResourceAggregation().then((res) => {
-      dataList.value = res.data.data
+      dataList.value = res.data.data;
+      console.log('res.data.data------------>', res.data.data);
+      
       res.data.data.map((item, index) => {
         console.log('dataList', dataList.value)
         switch (item.type) {
@@ -55,7 +57,8 @@
           case '用户量':
             dataList.value[index].organization = '人'
             break
-          case '覆盖部门量':
+          // case '覆盖部门量':
+          case '资源汇聚部门量':
             dataList.value[index].organization = '个'
             break
         }

front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue

@@ -203,6 +203,7 @@
           </div>
         </div>
       </template>
+      
       <template v-else>
         <div class="bottom">
           <div
@@ -301,6 +302,16 @@
                 :list="props.fileList2"
                 tip="支持文件类型，大小不超过100M"
               ></upload>
+              <upload
+                v-else-if="item.type == 'richText' && item.name == '技术文档'"
+                type="附件"
+                btnName="上传技术文档"
+                :maxCount="1"
+                :data="item"
+                :busType="2"
+                :list="props.fileList2"
+                tip="支持.doc,.docx,.zip,.ppt,.pdf类型，大小不超过100M"
+              ></upload>
               <upload
                 v-else-if="item.type == 'package' && item.name == '上传附件'"
                 type="附件"

front/src/views/components/upload/index.vue

@@ -159,7 +159,7 @@
     width: unset;
     button {
       height: 30px;
-      width: 100px;
+      width: 120px;
       border: 1px solid #bbd3ef;
       border-radius: 6px;
       background: #edf4fc;

front/src/views/mynoticeView/components/NoticeList.vue

@@ -15,12 +15,7 @@
     </a-breadcrumb>
     <div class="top">
       <div class="left">
-        <div
-          class="item"
-          :class="{ select: selectNav == nav.key }"
-          v-for="nav in navList"
-          :key="nav.key"
-        >
+        <div class="item" :class="{ select: selectNav == nav.key }" v-for="nav in navList" :key="nav.key">
           <i :class="nav.key" @click="changeNav(nav)"></i>
           <div>{{ nav.title + '(' + nav.num + ')' }}</div>
         </div>
@@ -42,13 +37,7 @@
     </div>
     <div class="btn">
       <div class="left">
-        <a-select
-          ref="select"
-          v-model:value="value"
-          style="width: 120px"
-          @focus="focus"
-          @change="handleChange"
-        >
+        <a-select ref="select" v-model:value="value" style="width: 120px" @focus="focus" @change="handleChange">
           <a-select-option value="全部消息">全部消息</a-select-option>
           <a-select-option value="已读消息">已读消息</a-select-option>
           <a-select-option value="未读消息">未读消息</a-select-option>
@@ -62,33 +51,26 @@
         </div>
       </div>
       <div class="right">
-        <a-checkbox
-          :checked="
-            selectData.length !== 0 && selectData.length === data.length
-          "
-          stlye="margin-right:0.3rem;"
-          @change="changeCheckAll()"
-        ></a-checkbox>
+        <a-checkbox :checked="
+          selectData.length !== 0 && selectData.length === data.length
+        " stlye="margin-right:0.3rem;" @change="changeCheckAll()"></a-checkbox>
         <div>全选当前页</div>
         <span @click="read()">标记为已读</span>
       </div>
     </div>
     <div class="main">
       <a-list item-layout="horizontal" :data-source="data">
-        <template #renderItem="{ item }">
+        <template #renderItem="{ item }" @click="goNoticePage(item)">
           <a-list-item>
             <a-list-item-meta description="">
               <template #title>
-                <div class="left" @click="read(item)">
+                <div class="left" @click="read(item)" :class="item.readStatus === 0 ? 'bold-text' : ''">
                   {{ item.content }}
                 </div>
                 <div class="right">{{ '发布时间：' + item.senderDate }}</div>
               </template>
               <template #avatar>
-                <a-checkbox
-                  :checked="item.checked"
-                  @change="changeCheckBox(item)"
-                ></a-checkbox>
+                <a-checkbox :checked="item.checked" @change="changeCheckBox(item)"></a-checkbox>
                 <a-badge dot :offset="[-30, 5]" v-show="item.readStatus == 0">
                   <a-avatar :src="item.src" />
                 </a-badge>
@@ -100,353 +82,383 @@
         </template>
       </a-list>
     </div>
-    <a-pagination
-      v-model:current="pageNum"
-      v-model:pageSize="pageSize"
-      :total="total"
-      show-less-items
-      :show-size-changer="false"
-      @change="changePageNum"
-    />
+    <a-pagination v-model:current="pageNum" v-model:pageSize="pageSize" :total="total" show-less-items
+      :show-size-changer="false" @change="changePageNum" />
   </div>
 </template>
 <script setup>
-  // import { SearchOutlined } from '@ant-design/icons-vue'
-  import { ref, reactive, onBeforeUnmount } from 'vue'
-  import mybus from '@/myplugins/mybus'
-  import { message } from 'ant-design-vue'
-  import { mynotice, mynoticeRead } from '@/api/home'
-  import { useRouter } from 'vue-router'
-  const router = useRouter()
-  const total = ref(0)
-  const pageSize = ref(8)
-  const pageNum = ref(1)
-  const value = ref('全部消息')
-  const obj = reactive({ page: pageNum.value, limit: pageSize.value })
-  const navList = reactive([
-    {
-      title: '全部',
-      key: 'all',
-      num: 0,
-    },
-    {
-      title: '通知',
-      key: 'notice',
-      num: 0,
-    },
-    {
-      title: '评论',
-      key: 'comment',
-      num: 0,
-    },
-    {
-      title: '其它',
-      key: 'other',
-      num: 0,
-    },
-  ])
-  const selectNav = ref('all')
-  const selectData = ref([])
-  const data = ref([])
-  const changeNav = (nav) => {
-    selectNav.value = nav.key
-    if (nav.key === 'all') {
-      delete obj.from
-    } else {
-      obj.from = nav.title
-    }
-    value.value = '全部消息'
-    delete obj.readStatus
-    init()
+// import { SearchOutlined } from '@ant-design/icons-vue'
+import { ref, reactive, onBeforeUnmount } from 'vue'
+import mybus from '@/myplugins/mybus'
+import { message } from 'ant-design-vue'
+import { mynotice, mynoticeRead } from '@/api/home'
+import { useRouter } from 'vue-router'
+const router = useRouter()
+const total = ref(0)
+const pageSize = ref(8)
+const pageNum = ref(1)
+const value = ref('全部消息')
+const obj = reactive({ page: pageNum.value, limit: pageSize.value })
+const navList = reactive([
+  {
+    title: '全部',
+    key: 'all',
+    num: 0,
+  },
+  {
+    title: '通知',
+    key: 'notice',
+    num: 0,
+  },
+  {
+    title: '评论',
+    key: 'comment',
+    num: 0,
+  },
+  {
+    title: '其它',
+    key: 'other',
+    num: 0,
+  },
+])
+const selectNav = ref('all')
+const selectData = ref([])
+const data = ref([])
+const changeNav = (nav) => {
+  selectNav.value = nav.key
+  if (nav.key === 'all') {
+    delete obj.from
+  } else {
+    obj.from = nav.title
   }
-  const changeCheckBox = (item) => {
-    item.checked = !item.checked
-    if (item.checked) {
-      selectData.value.push(item.id)
-    } else {
-      selectData.value = selectData.value.filter((val) => val !== item.id)
-    }
+  value.value = '全部消息'
+  delete obj.readStatus
+  init()
+}
+const changeCheckBox = (item) => {
+  item.checked = !item.checked
+  if (item.checked) {
+    selectData.value.push(item.id)
+  } else {
+    selectData.value = selectData.value.filter((val) => val !== item.id)
   }
-  const changeCheckAll = () => {
-    if (selectData.value.length == data.value.length) {
-      selectData.value = []
-      data.value.forEach((val) => {
-        val.checked = false
-      })
-    } else {
-      selectData.value = []
-      data.value.forEach((val) => {
-        val.checked = true
-        selectData.value.push(val.id)
-      })
-    }
-  }
-  const changePageNum = (page) => {
-    pageNum.value = page
-    obj.page = pageNum.value
-    init()
-  }
-  const handleChange = () => {
-    pageNum.value = 1
-    obj.page = pageNum.value
-    switch (value.value) {
-      case '全部消息':
-        delete obj.readStatus
-        break
-      case '已读消息':
-        obj.readStatus = 1
-        break
-      case '未读消息':
-        obj.readStatus = 0
-        break
-      default:
-        delete obj.readStatus
-        break
-    }
-    init()
-  }
-  const goBack = (url) => {
-    router.push({
-      path: url,
+}
+const changeCheckAll = () => {
+  if (selectData.value.length == data.value.length) {
+    selectData.value = []
+    data.value.forEach((val) => {
+      val.checked = false
+    })
+  } else {
+    selectData.value = []
+    data.value.forEach((val) => {
+      val.checked = true
+      selectData.value.push(val.id)
     })
   }
-  const read = (item) => {
-    // console.log(item)
-    if (selectData.value.length === 0 && !item) {
-      message.error('未选择消息！')
+}
+const changePageNum = (page) => {
+  pageNum.value = page
+  obj.page = pageNum.value
+  init()
+}
+const handleChange = () => {
+  pageNum.value = 1
+  obj.page = pageNum.value
+  switch (value.value) {
+    case '全部消息':
+      delete obj.readStatus
+      break
+    case '已读消息':
+      obj.readStatus = 1
+      break
+    case '未读消息':
+      obj.readStatus = 0
+      break
+    default:
+      delete obj.readStatus
+      break
+  }
+  init()
+}
+const goBack = (url) => {
+  router.push({
+    path: url,
+  })
+}
+const read = (item) => {
+  // console.log(item)
+  if (selectData.value.length === 0 && !item) {
+    message.error('未选择消息！')
+    return
+  }
+  console.log(selectData.value)
+  if (item) {
+    // 已读状态
+    if (item.readStatus === 1) {
       return
     }
-    console.log(selectData.value)
-    // let str = ''
-    // selectData.value.forEach((val, index) => {
-    //   str += val
-    //   if (index < selectData.value.length - 1) {
-    //     str += ';'
-    //   }
-    // })
-    if (item) {
-      mynoticeRead(item.id).then((res) => {
-        if (res.data.code == 0 ) {
-          message.success('通知已读！')
-        //    if(item.readStatus == 1){
-        //   message.success('通知已读！')
-        // }  if(item.readStatus == 0){
-        //   message.success('通知已设为已读！')
-        // }
+
+    mynoticeRead(item.id).then((res) => {
+      if (res.data.code == 0) {
+        message.success('通知已读！')
+        mybus.emit('getMynotice')
+        init()
+      } else {
+        message.error('操作失败！')
+      }
+    })
+  } else {
+    console.log('提交')
+    selectData.value.map((val) => {
+      mynoticeRead(val).then((res) => {
+        if (res.data.code == 0) {
+          // message.success('操作成功！')
           mybus.emit('getMynotice')
           init()
         } else {
           message.error('操作失败！')
         }
       })
-    } else {
-      console.log('提交')
-      selectData.value.map((val) => {
-        mynoticeRead(val).then((res) => {
-          if (res.data.code == 0) {
-            // message.success('操作成功！')
-            mybus.emit('getMynotice')
-            init()
-          } else {
-            message.error('操作失败！')
-          }
-        })
-      })
-    }
-  }
-  const init = () => {
-    // from 通知 评论 readStatus 0 未读  1 已读
-    mynotice(obj).then((res) => {
-      console.log('消息=============>', res.data.data)
-      res.data.data.list.forEach((val) => {
-        if (val.from === '通知') {
-          val.src = require('@/assets/mynoticeView/notice.png')
-        } else if (val.from === '评论') {
-          val.src = require('@/assets/mynoticeView/comment.png')
-        } else if (val.from === '其它') {
-          val.src = require('@/assets/mynoticeView/other.png')
-        }
-        val.checked = false
-      })
-      data.value = res.data.data.list
-      total.value = res.data.data.total
-      selectData.value = []
     })
   }
-  navList.forEach((val) => {
-    if (val.title === '全部') {
-      mynotice({ page: pageNum.value, limit: pageSize.value }).then((res) => {
-        val.num = res.data.data.total
-      })
-    } else {
-      mynotice({
-        page: pageNum.value,
-        limit: pageSize.value,
-        from: val.title,
-      }).then((res) => {
-        val.num = res.data.data.total
-      })
-    }
+}
+const init = () => {
+  // from 通知 评论 readStatus 0 未读  1 已读
+  mynotice(obj).then((res) => {
+    console.log('消息=============>', res.data.data)
+    res.data.data.list.forEach((val) => {
+      if (val.from === '通知') {
+        val.src = require('@/assets/mynoticeView/notice.png')
+      } else if (val.from === '评论') {
+        val.src = require('@/assets/mynoticeView/comment.png')
+      } else if (val.from === '其它') {
+        val.src = require('@/assets/mynoticeView/other.png')
+      }
+      val.checked = false
+    })
+    data.value = res.data.data.list
+    total.value = res.data.data.total
+    selectData.value = []
   })
+}
+navList.forEach((val) => {
+  if (val.title === '全部') {
+    mynotice({ page: pageNum.value, limit: pageSize.value }).then((res) => {
+      val.num = res.data.data.total
+    })
+  } else {
+    mynotice({
+      page: pageNum.value,
+      limit: pageSize.value,
+      from: val.title,
+    }).then((res) => {
+      val.num = res.data.data.total
+    })
+  }
+})
+init()
+mybus.on('noticeListInit', () => {
   init()
-  mybus.on('noticeListInit', () => {
-    init()
-  })
-  onBeforeUnmount(() => {
-    mybus.off('noticeListInit')
-  })
+})
+onBeforeUnmount(() => {
+  mybus.off('noticeListInit')
+})
 </script>
 <style lang="less" scoped>
-  .notice-list {
-    padding: 0.64rem 0 0;
-    background: #f4f5f8;
-    .ant-breadcrumb {
-      padding: 0.1rem 3.1rem;
-    }
-    .top {
-      background: #fff;
-      padding: 0.18rem 3.1rem 0;
+.notice-list {
+  padding: 0.64rem 0 0;
+  background: #f4f5f8;
+
+  .ant-breadcrumb {
+    padding: 0.1rem 3.1rem;
+  }
+
+  .top {
+    background: #fff;
+    padding: 0.18rem 3.1rem 0;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+
+
+    .left {
       display: flex;
-      justify-content: space-between;
-      align-items: center;
-      .left {
-        display: flex;
-        .item {
-          display: flex;
-          flex-direction: column;
-          justify-content: center;
-          align-items: center;
-          margin-left: 1.28rem;
-          margin-bottom: 0.16rem;
-          border-bottom: 3px solid #fff;
-          i {
-            display: inline-block;
-            width: 0.48rem;
-            height: 0.48rem;
-            margin-bottom: 0.15rem;
-            cursor: pointer;
-          }
-          .all {
-            background: url('~@/assets/mynoticeView/all.png') no-repeat;
-            background-size: 100%;
-          }
-          .notice {
-            background: url('~@/assets/mynoticeView/notice.png') no-repeat;
-            background-size: 100%;
-          }
-          .comment {
-            background: url('~@/assets/mynoticeView/comment.png') no-repeat;
-            background-size: 100%;
-          }
-          .other {
-            background: url('~@/assets/mynoticeView/other.png') no-repeat;
-            background-size: 100%;
-          }
-        }
-        .item:nth-of-type(1) {
-          margin-left: 0;
-        }
-        .select {
-          border-bottom: 3px solid #0058e1;
-          color: #0058e1;
-        }
-      }
-      .right {
+
+      .item {
         display: flex;
+        flex-direction: column;
+        justify-content: center;
         align-items: center;
-        height: 0.32rem;
-        div {
-          width: 0.5rem;
-        }
-        .reset {
-          color: #0058e1;
+        margin-left: 1.28rem;
+        margin-bottom: 0.16rem;
+        border-bottom: 3px solid #fff;
+
+        i {
+          display: inline-block;
+          width: 0.48rem;
+          height: 0.48rem;
+          margin-bottom: 0.15rem;
           cursor: pointer;
         }
-      }
-    }
-    .btn {
-      background: #fff;
-      margin-top: 0.16rem;
-      padding: 0.14rem 3.1rem 0;
-      display: flex;
-      justify-content: space-between;
-      .left {
-        display: flex;
-        align-items: center;
-        .ant-select {
-          margin-right: 0.24rem;
-        }
-        .check {
-          display: flex;
-          align-items: center;
-          div {
-            margin-left: 0.24rem;
-            span {
-              font-size: 18px;
-              color: #0058e1;
-            }
-          }
-          div:nth-of-type(1) {
-            margin-left: 0.12rem;
-          }
-        }
-      }
-      .right {
-        display: flex;
-        justify-content: space-around;
-        align-items: center;
-        div {
-          margin: 0 0.1rem;
-        }
-        span {
-          cursor: pointer;
-          color: #0058e1;
-          text-align: center;
-          align-self: center;
-          padding: 0.05rem 0.1rem;
-        }
 
-        span:hover {
-          background: rgba(0, 88, 225, 0.1);
+        .all {
+          background: url('~@/assets/mynoticeView/all.png') no-repeat;
+          background-size: 100%;
+        }
+
+        .notice {
+          background: url('~@/assets/mynoticeView/notice.png') no-repeat;
+          background-size: 100%;
+        }
+
+        .comment {
+          background: url('~@/assets/mynoticeView/comment.png') no-repeat;
+          background-size: 100%;
+        }
+
+        .other {
+          background: url('~@/assets/mynoticeView/other.png') no-repeat;
+          background-size: 100%;
         }
       }
+
+      .item:nth-of-type(1) {
+        margin-left: 0;
+      }
+
+      .select {
+        border-bottom: 3px solid #0058e1;
+        color: #0058e1;
+      }
     }
-    .main {
-      background: #fff;
-      padding: 0 3.1rem;
-      height: 4.75rem;
-      overflow-y: scroll;
-      :deep(.ant-list-item-meta) {
+
+    .right {
+      display: flex;
+      align-items: center;
+      height: 0.32rem;
+
+      div {
+        width: 0.5rem;
+      }
+
+      .reset {
+        color: #0058e1;
+        cursor: pointer;
+      }
+    }
+  }
+
+  .btn {
+    background: #fff;
+    margin-top: 0.16rem;
+    padding: 0.14rem 3.1rem 0;
+    display: flex;
+    justify-content: space-between;
+
+    .left {
+      display: flex;
+      align-items: center;
+
+      .ant-select {
+        margin-right: 0.24rem;
+      }
+
+
+      .check {
         display: flex;
         align-items: center;
-        .ant-checkbox-wrapper {
-          margin-right: 0.3rem;
-        }
-        .ant-list-item-meta-title {
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-          .left {
-            cursor: pointer;
-            width: 9.2rem;
-            max-height: 0.43rem;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            display: -webkit-box;
-            -webkit-line-clamp: 2;
-            -webkit-box-orient: vertical;
-            word-break: break-all;
-          }
-          .left:hover {
+
+        div {
+          margin-left: 0.24rem;
+
+          span {
+            font-size: 18px;
             color: #0058e1;
           }
         }
+
+        div:nth-of-type(1) {
+          margin-left: 0.12rem;
+        }
       }
     }
-    .ant-pagination {
-      background: #fff;
-      margin-top: 0;
-      padding: 0.2rem 0 0.2rem;
+
+    .right {
+      display: flex;
+      justify-content: space-around;
+      align-items: center;
+
+      div {
+        margin: 0 0.1rem;
+      }
+
+      span {
+        cursor: pointer;
+        color: #0058e1;
+        text-align: center;
+        align-self: center;
+        padding: 0.05rem 0.1rem;
+      }
+
+      span:hover {
+        background: rgba(0, 88, 225, 0.1);
+      }
     }
   }
+
+  .main {
+    background: #fff;
+    padding: 0 3.1rem;
+    height: 4.75rem;
+    overflow-y: scroll;
+
+    :deep(.ant-list-item-meta) {
+      display: flex;
+      align-items: center;
+
+      .ant-checkbox-wrapper {
+        margin-right: 0.3rem;
+      }
+
+      .ant-list-item-meta-title {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+
+        .bold-text {
+          font-weight: bold;
+          cursor: pointer;
+        }
+
+        .left {
+          width: 9.2rem;
+          max-height: 0.43rem;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          display: -webkit-box;
+          -webkit-line-clamp: 2;
+          -webkit-box-orient: vertical;
+          word-break: break-all;
+        }
+
+        .ant-badge-dot {
+          width: 8px;
+          height: 8px;
+        }
+
+        .left:hover {
+          color: #0058e1;
+        }
+      }
+    }
+  }
+
+  .ant-pagination {
+    background: #fff;
+    margin-top: 0;
+    padding: 0.2rem 0 0.2rem;
+  }
+}
 </style>