From ded5cfed226e80ffc50861219fd786f2af17413b Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Sun, 2 Oct 2022 14:59:23 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=B7=B2=E5=8A=9E?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=8C=E8=83=BD=E5=8A=9B=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?processDefinitionKey:=20abilityprocess=5Fv2=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=EF=BC=8C=E5=B8=82=E5=B1=80v2=20=EF=BC=8C=E5=85=B6=E4=BB=96v3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/public/config/basicConfig.js |  4 ++--
 back/src/utils/location.js        | 11 +++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/back/public/config/basicConfig.js b/back/public/config/basicConfig.js
index e2f5b5f3..37616e9b 100644
--- a/back/public/config/basicConfig.js
+++ b/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', // 开发
diff --git a/back/src/utils/location.js b/back/src/utils/location.js
index d8914b13..82fc8775 100644
--- a/back/src/utils/location.js
+++ b/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

From c23d0aeee7448b91ef1e5cdf4d2cbb057a89b928 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Mon, 3 Oct 2022 15:43:43 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E5=B8=82=E5=B1=80=EF=BC=9A=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E7=8A=B6=E6=80=81=EF=BC=8C=E6=9C=AA=E8=AF=BB=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E6=8F=90=E7=A4=BA=E5=B7=B2=E8=AF=BB=EF=BC=8C=E5=B7=B2?=
 =?UTF-8?q?=E8=AF=BB=E7=82=B9=E5=87=BB=E4=B8=8D=E6=8F=90=E7=A4=BA=EF=BC=8C?=
 =?UTF-8?q?=E5=8A=A0=E7=B2=97=E6=9C=AA=E8=AF=BB=E6=B6=88=E6=81=AF=E5=AD=97?=
 =?UTF-8?q?=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mynoticeView/components/NoticeList.vue    | 684 +++++++++---------
 1 file changed, 348 insertions(+), 336 deletions(-)

diff --git a/front/src/views/mynoticeView/components/NoticeList.vue b/front/src/views/mynoticeView/components/NoticeList.vue
index 59f6b843..1f4cdab7 100644
--- a/front/src/views/mynoticeView/components/NoticeList.vue
+++ b/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>

From 12d3cc221cf12771e1f63b9c58c147c6d9bbe569 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Mon, 3 Oct 2022 15:44:54 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E5=B8=82=E5=B1=80=EF=BC=9A=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E9=A1=B5=E9=9D=A2---=E5=BA=94=E7=94=A8=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E9=80=89=E9=A1=B9=E4=B8=8B=E6=96=B9=E5=8A=A0=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=9A=E5=A6=82=E9=80=89=E9=A1=B9=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=AF=B7=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/apply.vue | 1551 +++++++++++++++-----------------
 1 file changed, 726 insertions(+), 825 deletions(-)

diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index 074472f4..ef832d05 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -8,159 +8,69 @@
         </div>
         <div class="form-container">
           <div v-if="applySuccess">
-            <a-form
-              ref="formRef"
-              :model="formName"
-              name="basic"
-              :label-col="{ style: { width: '106px' } }"
-              :wrapper-col="{ style: { width: '230px' } }"
-              labelAlign="left"
-              autocomplete="off"
-            >
+            <a-form ref="formRef" :model="formName" name="basic" :label-col="{ style: { width: '106px' } }"
+              :wrapper-col="{ style: { width: '230px' } }" labelAlign="left" autocomplete="off">
               <div class="base-info flex-row-start">
-                <a-form-item
-                  label="申请标题"
-                  name="title"
-                  :rules="[{ required: true, message: '请输入申请标题' }]"
-                >
-                  <a-input
-                    placeholder="请输入能力申请标题"
-                    v-model:value="formName.title"
-                  />
+                <a-form-item label="申请标题" name="title" :rules="[{ required: true, message: '请输入申请标题' }]">
+                  <a-input placeholder="请输入能力申请标题" v-model:value="formName.title" />
                 </a-form-item>
                 <!-- 西海岸-摄像头-增加过期时间 -->
-                <a-form-item
-                  v-if="isCamera && isXiHaiAn"
-                  label="过期时间"
-                  name="expireDate"
-                  :rules="[{ required: true, message: '请选择过期时间' }]"
-                  style="margin-left: 22px"
-                >
-                  <a-select
-                    v-model:value="formName.expireDate"
-                    placeholder="请选择过期时间"
-                    style="width: 200px"
-                    :options="expireDateOptions"
-                  ></a-select>
+                <a-form-item v-if="isCamera && isXiHaiAn" label="过期时间" name="expireDate"
+                  :rules="[{ required: true, message: '请选择过期时间' }]" style="margin-left: 22px">
+                  <a-select v-model:value="formName.expireDate" placeholder="请选择过期时间" style="width: 200px"
+                    :options="expireDateOptions"></a-select>
                 </a-form-item>
               </div>
               <div class="base-info">
-                <a-form-item
-                  label="申请人信息"
-                  name="user"
-                  :rules="[{ required: true, message: '请输入申请人' }]"
-                >
-                  <a-input
-                    placeholder="请输入申请人"
-                    v-model:value="formName.user"
-                    disabled
-                  />
+                <a-form-item label="申请人信息" name="user" :rules="[{ required: true, message: '请输入申请人' }]">
+                  <a-input placeholder="请输入申请人" v-model:value="formName.user" disabled />
                 </a-form-item>
-                <a-form-item
-                  style="margin: 0 22px"
-                  label="电话"
-                  name="phone"
-                  :rules="[
-                    {
-                      required: true,
-                      pattern: /^1[3456789]\d{9}$/,
-                      message: '请输入正确的电话号码',
-                    },
-                  ]"
-                >
-                  <a-input
-                    placeholder="请输入申请人电话"
-                    v-model:value="formName.phone"
-                  />
+                <a-form-item style="margin: 0 22px" label="电话" name="phone" :rules="[
+                  {
+                    required: true,
+                    pattern: /^1[3456789]\d{9}$/,
+                    message: '请输入正确的电话号码',
+                  },
+                ]">
+                  <a-input placeholder="请输入申请人电话" v-model:value="formName.phone" />
                 </a-form-item>
-                <a-form-item
-                  label="单位"
-                  name="unit"
-                  :rules="[{ required: true, message: '请输入单位' }]"
-                >
-                  <a-input
-                    placeholder="请输入单位"
-                    v-model:value="formName.unit"
-                    disabled
-                    v-if="deptFlage"
-                  />
-                  <a-select
-                    v-else
-                    placeholder="请选择归属部门"
-                    v-model:value="formName.unit"
-                    @change="deptIdChangeFunction"
-                  >
-                    <a-select-option
-                      v-for="(item, index) in deptNameAll"
-                      :key="`${index}-${item}`"
-                      :value="item.name"
-                    >
+                <a-form-item label="单位" name="unit" :rules="[{ required: true, message: '请输入单位' }]">
+                  <a-input placeholder="请输入单位" v-model:value="formName.unit" disabled v-if="deptFlage" />
+                  <a-select v-else placeholder="请选择归属部门" v-model:value="formName.unit" @change="deptIdChangeFunction">
+                    <a-select-option v-for="(item, index) in deptNameAll" :key="`${index}-${item}`" :value="item.name">
                       {{ item.name }}
                     </a-select-option>
                   </a-select>
                 </a-form-item>
               </div>
               <div class="base-info" v-if="flag">
-                <a-form-item
-                  label="应用系统"
-                  name="applicationSystem"
-                  :rules="[{ required: true, message: '请选择应用系统' }]"
-                >
-                  <a-tooltip>
-                    <template #title>
-                      请输入关键字（如选项没有系统请新增）
-                    </template>
-                    <a-select
-                      v-model:value="formName.applicationSystem"
-                      show-search
-                      placeholder="请输入关键字（如选项没有系统请新增）"
-                      style="width: 230px"
-                      :options="systemOptions"
-                      @focus="handleFocus"
-                      @blur="handleBlur"
-                      @change="systemHandleChange"
-                      @search="systemHandleSearch"
-                    ></a-select>
-                  </a-tooltip>
-                </a-form-item>
-                <a-form-item
-                  class="applicationScene"
-                  label="应用领域"
-                  name="applicationScene"
-                  :rules="[{ required: true, message: '请选择应用领域' }]"
-                  style="width: 6.93rem"
-                >
-                  <a-select
-                    v-model:value="formName.applicationScene"
-                    :options="applicationSceneOpthion"
-                    mode="tags"
-                    :size="size"
-                    placeholder="请选择应用领域"
-                    :filterOption="false"
-                    :searchValue="false"
-                    style="width: 5.87rem"
-                  ></a-select>
+                <div style="margin-bottom: 24px">
+                  <a-form-item style="margin-bottom:0" label="应用系统" name="applicationSystem"
+                    :rules="[{ required: true, message: '请选择应用系统' }]">
+                    <a-select v-model:value="formName.applicationSystem" show-search placeholder="请选择应用系统"
+                      style="width: 230px" :options="systemOptions" @focus="handleFocus" @blur="handleBlur"
+                      @change="systemHandleChange" @search="systemHandleSearch"></a-select>
+                  </a-form-item>
+                  <span style="font-size:12px;color:#666;padding-left:106px"> 请输入关键字（如选项没有系统请新增）</span>
+                </div>
+                <a-form-item class="applicationScene" label="应用领域" name="applicationScene"
+                  :rules="[{ required: true, message: '请选择应用领域' }]" style="width: 6.93rem">
+                  <a-select v-model:value="formName.applicationScene" :options="applicationSceneOpthion" mode="tags"
+                    :size="size" placeholder="请选择应用领域" :filterOption="false" :searchValue="false"
+                    style="width: 5.87rem"></a-select>
                 </a-form-item>
               </div>
+
               <div>
-                <a-form-item
-                  label="需求依据"
-                  name="applicationBackground"
-                  :rules="[
-                    { required: true, message: '请输入需求依据' },
-                    { min: 50, message: '需求依据最少为50个字' },
-                  ]"
-                >
-                  <a-textarea
-                    placeholder="请输入需求依据"
-                    v-model:value="formName.applicationBackground"
-                    :rows="4"
-                  />
+                <a-form-item label="需求依据" name="applicationBackground" :rules="[
+                  { required: true, message: '请输入需求依据' },
+                  { min: 50, message: '需求依据最少为50个字' },
+                ]">
+                  <a-textarea placeholder="请输入需求依据" v-model:value="formName.applicationBackground" :rows="4" />
                 </a-form-item>
               </div>
               <div class="bottom-btn">
-                <a-button
-                  style="
+                <a-button style="
                     width: 80px;
                     height: 38px;
                     margin-right: 20px;
@@ -171,15 +81,10 @@
                     border: none;
                     padding: 0;
                     text-align: center;
-                  "
-                  type="primary"
-                  html-type="cancle"
-                  @click="resetFields()"
-                >
+                  " type="primary" html-type="cancle" @click="resetFields()">
                   退出申请
                 </a-button>
-                <a-button
-                  style="
+                <a-button style="
                     width: 80px;
                     height: 38px;
                     background: #0087ff;
@@ -189,11 +94,7 @@
                     border: none;
                     padding: 0;
                     text-align: center;
-                  "
-                  type="primary"
-                  html-type="submit"
-                  @click="processStartHandle()"
-                >
+                  " type="primary" html-type="submit" @click="processStartHandle()">
                   提交申请
                 </a-button>
               </div>
@@ -211,306 +112,242 @@
   </div>
 </template>
 <script>
-  import AbilityToApplyFor from './AbilityToApplyFor.vue'
-  import HomeHeader from '@/views/home/components/header'
-  import { reactive, ref, watch, onBeforeUnmount } from 'vue'
-  import { useRouter } from 'vue-router'
-  import { message } from 'ant-design-vue'
-  import qs from 'qs'
-  import { Upload } from 'ant-design-vue'
-  import {
-    lastestPage,
-    tabilityapplication,
-    startOfBusinessKey,
-    updateInstanceId,
-    submitApply,
-    applyAllApplication,
-    getUser,
-    getUserInfo,
-    relaunch,
-    selectOne,
-  } from '@/api/home'
-  import { getDeptAll } from '@/api/user'
-  import { getCategoryTreePage, endProcess } from '@/api/personalCenter'
-  import mybus from '@/myplugins/mybus'
-  import { sgcDel, getApplyForm } from '@/api/personalCenter'
-  import { pageWithAttrs, updateIntegrationServices } from '@/api/home'
-  import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
-  import { getIntegrationDetail, soldierApply } from '@/api/home'
-  import * as moment from 'moment'
+import AbilityToApplyFor from './AbilityToApplyFor.vue'
+import HomeHeader from '@/views/home/components/header'
+import { reactive, ref, watch, onBeforeUnmount } from 'vue'
+import { useRouter } from 'vue-router'
+import { message } from 'ant-design-vue'
+import qs from 'qs'
+import { Upload } from 'ant-design-vue'
+import {
+  lastestPage,
+  tabilityapplication,
+  startOfBusinessKey,
+  updateInstanceId,
+  submitApply,
+  applyAllApplication,
+  getUser,
+  getUserInfo,
+  relaunch,
+  selectOne,
+} from '@/api/home'
+import { getDeptAll } from '@/api/user'
+import { getCategoryTreePage, endProcess } from '@/api/personalCenter'
+import mybus from '@/myplugins/mybus'
+import { sgcDel, getApplyForm } from '@/api/personalCenter'
+import { pageWithAttrs, updateIntegrationServices } from '@/api/home'
+import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
+import { getIntegrationDetail, soldierApply } from '@/api/home'
+import * as moment from 'moment'
 
-  export default {
-    name: '',
-    props: {},
-    components: {
-      HomeHeader,
-      AbilityToApplyFor,
-    },
-    setup() {
-      const router = useRouter()
-      const disabled = ref(false)
-      const flag = ref(false)
-      const list = ref(JSON.parse(localStorage.getItem('applyList')))
-      const deptNameAll = ref([]) //所有部门名称
-      const deptFlage = ref(true) //判断是否存在默认部门名称
-      const applyAll = router.currentRoute.value.query.applyAll
-      // 融合服务id
-      const integrationServicesId =
-        router.currentRoute.value.query.integrationServicesId
-      // 融合服务详情
-      const integrationServicesItemInfo = ref(null)
-      const num = ref(0)
-      // 过期时间
-      const expireDateOptions = [
-        {
-          value: moment().add(30, 'days').format('YYYY-MM-DD HH:mm:ss'),
-          label: '30天',
-        },
-        {
-          value: moment().add(60, 'days').format('YYYY-MM-DD HH:mm:ss'),
-          label: '60天',
-        },
-        {
-          value: moment().add(90, 'days').format('YYYY-MM-DD HH:mm:ss'),
-          label: '90天',
-        },
-      ]
+export default {
+  name: '',
+  props: {},
+  components: {
+    HomeHeader,
+    AbilityToApplyFor,
+  },
+  setup() {
+    const router = useRouter()
+    const disabled = ref(false)
+    const flag = ref(false)
+    const list = ref(JSON.parse(localStorage.getItem('applyList')))
+    const deptNameAll = ref([]) //所有部门名称
+    const deptFlage = ref(true) //判断是否存在默认部门名称
+    const applyAll = router.currentRoute.value.query.applyAll
+    // 融合服务id
+    const integrationServicesId =
+      router.currentRoute.value.query.integrationServicesId
+    // 融合服务详情
+    const integrationServicesItemInfo = ref(null)
+    const num = ref(0)
+    // 过期时间
+    const expireDateOptions = [
+      {
+        value: moment().add(30, 'days').format('YYYY-MM-DD HH:mm:ss'),
+        label: '30天',
+      },
+      {
+        value: moment().add(60, 'days').format('YYYY-MM-DD HH:mm:ss'),
+        label: '60天',
+      },
+      {
+        value: moment().add(90, 'days').format('YYYY-MM-DD HH:mm:ss'),
+        label: '90天',
+      },
+    ]
 
-      if (!applyAll) {
-        list.value.map((item) => {
-          item.arr.map((val) => {
-            let obj = item.children
-              ? item.children.filter((type) => type.id == val.id)[0]
-              : val.type !== '应用资源'
-            if (obj) {
-              if (obj.type !== '应用资源') {
-                flag.value = true
-              }
+    if (!applyAll) {
+      list.value.map((item) => {
+        item.arr.map((val) => {
+          let obj = item.children
+            ? item.children.filter((type) => type.id == val.id)[0]
+            : val.type !== '应用资源'
+          if (obj) {
+            if (obj.type !== '应用资源') {
+              flag.value = true
             }
-          })
-          if (item.checkedList) {
-            console.log(item)
-            num.value += Number(item.checkedList.length)
           }
         })
-      }
-      console.log('list', list.value)
-      const baseURL = window.SITE_CONFIG.apiURL
-      let record = ref('1')
-      const text = ref('')
-      // 西海岸-特殊处理
-      let wrjAndDbText = ['单兵设备', '无人机']
-      const isXiHaiAn = ref(whoShow.itShowXiHaiAn)
-      // 西海岸-判断是否是基础设施-摄像头
-      const isCamera = ref(false)
-      if (
-        list.value[0] &&
-        list.value[0].arr &&
-        list.value[0].arr[0] &&
-        list.value[0].arr[0].type == '基础设施'
-      ) {
-        isCamera.value = true
-      }
-      const formName = reactive({
-        title: applyAll
-          ? '全部应用资源申请'
-          : wrjAndDbText.includes(
-              list.value[0].arr &&
-                list.value[0].arr[0] &&
-                list.value[0].arr[0].type
-            )
+        if (item.checkedList) {
+          console.log(item)
+          num.value += Number(item.checkedList.length)
+        }
+      })
+    }
+    console.log('list', list.value)
+    const baseURL = window.SITE_CONFIG.apiURL
+    let record = ref('1')
+    const text = ref('')
+    // 西海岸-特殊处理
+    let wrjAndDbText = ['单兵设备', '无人机']
+    const isXiHaiAn = ref(whoShow.itShowXiHaiAn)
+    // 西海岸-判断是否是基础设施-摄像头
+    const isCamera = ref(false)
+    if (
+      list.value[0] &&
+      list.value[0].arr &&
+      list.value[0].arr[0] &&
+      list.value[0].arr[0].type == '基础设施'
+    ) {
+      isCamera.value = true
+    }
+    const formName = reactive({
+      title: applyAll
+        ? '全部应用资源申请'
+        : wrjAndDbText.includes(
+          list.value[0].arr &&
+          list.value[0].arr[0] &&
+          list.value[0].arr[0].type
+        )
           ? list.value[0].arr[0].type + '申请'
           : list.value[0].children
-          ? '申请' +
+            ? '申请' +
             list.value[0].children
               .filter((val) => val.id == list.value[0].checkedList[0])[0]
               .resourceName.concat(
                 num.value > 1 ? '等' + num.value + '项能力' : ''
               )
-          : '申请' + list.value[0].arr[0].resourceName, // 标题
-        // applicationSystem: '', // 应用系统
-        applicationScene: [], // 应用领域
-        applicationBackground: '', // 应用背景
-        effectWish: '', // 期望效果
-        user: '',
-        userId: '',
-        phone: '',
-        unit: '',
-        deptId: '',
-        system: [],
-        enclosure: '', //附件
-        enclosureName: '', //附件
-      })
-      const dataList = ref([])
-      const id = router.currentRoute.value.query.id
-      const taskId = router.currentRoute.value.query.taskId
-      const businessKey = ref(router.currentRoute.value.query.id)
-      if (id) {
-        getApplyForm(id).then((res) => {
-          console.log('修改==============>', res.data.data)
-          formName.applicationSystem = res.data.data.applicationSystem || ''
-          formName.applicationScene = res.data.data.applicationScene || []
-          formName.applicationBackground =
-            res.data.data.applicationBackground || ''
-          formName.effectWish = res.data.data.effectWish || ''
-          formName.phone = res.data.data.phone || ''
-          formName.enclosure = res.data.data.enclosure || ''
-          formName.enclosureName = res.data.data.enclosureName || ''
-          if (res.data.data.enclosure) {
-            fileList.value.push({
-              name: res.data.data.enclosureName,
-              url: res.data.data.enclosure,
-            })
-          }
-        })
-      }
-      getUser().then((res) => {
-        formName.user = res.data.data.realName
-        formName.userId = res.data.data.id
-        getUserInfo(formName.userId).then((res) => {
-          if (res.data.data.mobile) {
-            formName.phone = res.data.data.mobile
-          }
-          formName.unit = res.data.data.deptName
-          if (!formName.unit) {
-            deptFlage.value = false
-            //调用查询所有部门名称的接口
-            getDeptAll().then((res) => {
-              deptNameAll.value = res.data.data
-            })
-          }
-        })
-      })
-      //归属部门选中改变事件
-      const deptIdChangeFunction = (name) => {
-        deptNameAll.value.map((item) => {
-          if (item.name == name) {
-            formName.deptId = item.id
-          }
-        })
-        console.log(formName)
-      }
-      const applicationSceneOpthion = ref([])
-      getCategoryTreePage({
-        page: 1,
-        limit: 20,
-        dictTypeId: '1513712507692818433',
-        deFlage: 0,
-      }).then((res) => {
-        res.data.data.list.map((val) => {
-          applicationSceneOpthion.value.push({
-            value: val.dictLabel,
-            label: val.dictLabel,
+            : '申请' + list.value[0].arr[0].resourceName, // 标题
+      // applicationSystem: '', // 应用系统
+      applicationScene: [], // 应用领域
+      applicationBackground: '', // 应用背景
+      effectWish: '', // 期望效果
+      user: '',
+      userId: '',
+      phone: '',
+      unit: '',
+      deptId: '',
+      system: [],
+      enclosure: '', //附件
+      enclosureName: '', //附件
+    })
+    const dataList = ref([])
+    const id = router.currentRoute.value.query.id
+    const taskId = router.currentRoute.value.query.taskId
+    const businessKey = ref(router.currentRoute.value.query.id)
+    if (id) {
+      getApplyForm(id).then((res) => {
+        console.log('修改==============>', res.data.data)
+        formName.applicationSystem = res.data.data.applicationSystem || ''
+        formName.applicationScene = res.data.data.applicationScene || []
+        formName.applicationBackground =
+          res.data.data.applicationBackground || ''
+        formName.effectWish = res.data.data.effectWish || ''
+        formName.phone = res.data.data.phone || ''
+        formName.enclosure = res.data.data.enclosure || ''
+        formName.enclosureName = res.data.data.enclosureName || ''
+        if (res.data.data.enclosure) {
+          fileList.value.push({
+            name: res.data.data.enclosureName,
+            url: res.data.data.enclosure,
           })
+        }
+      })
+    }
+    getUser().then((res) => {
+      formName.user = res.data.data.realName
+      formName.userId = res.data.data.id
+      getUserInfo(formName.userId).then((res) => {
+        if (res.data.data.mobile) {
+          formName.phone = res.data.data.mobile
+        }
+        formName.unit = res.data.data.deptName
+        if (!formName.unit) {
+          deptFlage.value = false
+          //调用查询所有部门名称的接口
+          getDeptAll().then((res) => {
+            deptNameAll.value = res.data.data
+          })
+        }
+      })
+    })
+    //归属部门选中改变事件
+    const deptIdChangeFunction = (name) => {
+      deptNameAll.value.map((item) => {
+        if (item.name == name) {
+          formName.deptId = item.id
+        }
+      })
+      console.log(formName)
+    }
+    const applicationSceneOpthion = ref([])
+    getCategoryTreePage({
+      page: 1,
+      limit: 20,
+      dictTypeId: '1513712507692818433',
+      deFlage: 0,
+    }).then((res) => {
+      res.data.data.list.map((val) => {
+        applicationSceneOpthion.value.push({
+          value: val.dictLabel,
+          label: val.dictLabel,
         })
       })
-      const formRef = ref()
-      const applySuccess = ref(true)
-      const dataForm = {
-        processDefinitionKey: 'abilityprocess',
-      }
-      const callbacks = {
-        startProcessSuccessCallback: null,
-        startProcessErrorCallback: null,
-        formSaveSuccessCallback: null,
-        formSaveErrorCallback: null,
-      }
-      const instanceIdUrl = '/processForm/tabilityapplication/updateInstanceId'
-      const formUrl = '/processForm/tabilityapplication'
-      //退出返回上一页
-      const resetFields = () => {
-        window.history.go(-1)
-      }
+    })
+    const formRef = ref()
+    const applySuccess = ref(true)
+    const dataForm = {
+      processDefinitionKey: 'abilityprocess',
+    }
+    const callbacks = {
+      startProcessSuccessCallback: null,
+      startProcessErrorCallback: null,
+      formSaveSuccessCallback: null,
+      formSaveErrorCallback: null,
+    }
+    const instanceIdUrl = '/processForm/tabilityapplication/updateInstanceId'
+    const formUrl = '/processForm/tabilityapplication'
+    //退出返回上一页
+    const resetFields = () => {
+      window.history.go(-1)
+    }
 
-      // 跳转到能力集市
-      const jumpToDetailsPageconetent = () => {
-        setTimeout(() => {
-          router.push({
-            path: '/DetailsPageconetent',
-            query: {
-              select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
-            },
-          })
-        }, 1000)
-      }
+    // 跳转到能力集市
+    const jumpToDetailsPageconetent = () => {
+      setTimeout(() => {
+        router.push({
+          path: '/DetailsPageconetent',
+          query: {
+            select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
+          },
+        })
+      }, 1000)
+    }
 
-      // 提交申请
-      const processStartHandle = () => {
-        formRef.value.validate().then(() => {
-          if (!formUrl) {
-            return message.error('请设置保存表单的URL')
-          }
-          if (!formName) {
-            return message.error('请设置表单名称')
-          }
+    // 提交申请
+    const processStartHandle = () => {
+      formRef.value.validate().then(() => {
+        if (!formUrl) {
+          return message.error('请设置保存表单的URL')
+        }
+        if (!formName) {
+          return message.error('请设置表单名称')
+        }
 
-          if (id) {
-            endProcess({ instanceId: taskId }).then((end) => {
-              if (end.data.code == 0) {
-                let ids = []
-                let falgNum = 0
-                let sxt = true
-                formName.system = []
-                console.log('list==================', list.value)
-                list.value.map((val) => {
-                  val.arr.map((item) => {
-                    if (item.type !== '基础设施') {
-                      falgNum++
-                    }
-                  })
-                })
-                list.value.map((val) => {
-                  val.arr.map((item) => {
-                    if (item.type !== '基础设施') {
-                      formName.system.push({
-                        resourceId: item.resourceId,
-                        resourceName: item.resourceName,
-                      })
-                      falgNum++
-                      console.log(item.id)
-                      if (item.id) {
-                        ids.push(item.id)
-                      }
-                    } else {
-                      infrastructureConfirm(item, falgNum, sxt)
-                    }
-                  })
-                })
-                if (formName.system.length !== 0) {
-                  if (formName.applicationSystem.length == 0) {
-                    formName.applicationSystem = ''
-                  }
-                  submitApply(formName).then((res) => {
-                    message.success('申请提交成功，请到消息中心查看！')
-                    console.log('能力申请================>', res)
-                    if (res.data.code == 0) {
-                      if (ids && ids.length > 0) {
-                        sgcDel({ ids: ids }).then((res) => {
-                          if (res.data.msg === 'success') {
-                            mybus.emit('getSgcNum')
-                            jumpToDetailsPageconetent()
-                          }
-                        })
-                      } else {
-                        // 融合服务
-                        if (integrationServicesId) {
-                          getIntegrationServicesDeatil(
-                            integrationServicesId
-                          ).then((res) => {
-                            updateIntegrationServiceAction()
-                          })
-                        }
-                        jumpToDetailsPageconetent()
-                      }
-                    } else {
-                      message.error('申请失败！')
-                    }
-                  })
-                }
-              }
-            })
-          } else {
-            if (!applyAll) {
+        if (id) {
+          endProcess({ instanceId: taskId }).then((end) => {
+            if (end.data.code == 0) {
               let ids = []
               let falgNum = 0
               let sxt = true
@@ -540,16 +377,10 @@
                   }
                 })
               })
-              console.log('formName--ids-提交数据--------->', formName, ids)
               if (formName.system.length !== 0) {
                 if (formName.applicationSystem.length == 0) {
                   formName.applicationSystem = ''
                 }
-                // 西海岸：单兵设备、无人机单独调取其他接口
-                if (wrjAndDbText.includes(list.value[0].arr[0].type)) {
-                  handleWrjApply(formName)
-                  return
-                }
                 submitApply(formName).then((res) => {
                   message.success('申请提交成功，请到消息中心查看！')
                   console.log('能力申请================>', res)
@@ -577,433 +408,503 @@
                   }
                 })
               }
-            } else {
-              formName.applicationSystem = ''
-              applyAllApplication(formName).then((res) => {
+            }
+          })
+        } else {
+          if (!applyAll) {
+            let ids = []
+            let falgNum = 0
+            let sxt = true
+            formName.system = []
+            console.log('list==================', list.value)
+            list.value.map((val) => {
+              val.arr.map((item) => {
+                if (item.type !== '基础设施') {
+                  falgNum++
+                }
+              })
+            })
+            list.value.map((val) => {
+              val.arr.map((item) => {
+                if (item.type !== '基础设施') {
+                  formName.system.push({
+                    resourceId: item.resourceId,
+                    resourceName: item.resourceName,
+                  })
+                  falgNum++
+                  console.log(item.id)
+                  if (item.id) {
+                    ids.push(item.id)
+                  }
+                } else {
+                  infrastructureConfirm(item, falgNum, sxt)
+                }
+              })
+            })
+            console.log('formName--ids-提交数据--------->', formName, ids)
+            if (formName.system.length !== 0) {
+              if (formName.applicationSystem.length == 0) {
+                formName.applicationSystem = ''
+              }
+              // 西海岸：单兵设备、无人机单独调取其他接口
+              if (wrjAndDbText.includes(list.value[0].arr[0].type)) {
+                handleWrjApply(formName)
+                return
+              }
+              submitApply(formName).then((res) => {
+                message.success('申请提交成功，请到消息中心查看！')
+                console.log('能力申请================>', res)
                 if (res.data.code == 0) {
-                  message.success('申请提交成功，请到消息中心查看！')
-                  jumpToDetailsPageconetent()
+                  if (ids && ids.length > 0) {
+                    sgcDel({ ids: ids }).then((res) => {
+                      if (res.data.msg === 'success') {
+                        mybus.emit('getSgcNum')
+                        jumpToDetailsPageconetent()
+                      }
+                    })
+                  } else {
+                    // 融合服务
+                    if (integrationServicesId) {
+                      getIntegrationServicesDeatil(
+                        integrationServicesId
+                      ).then((res) => {
+                        updateIntegrationServiceAction()
+                      })
+                    }
+                    jumpToDetailsPageconetent()
+                  }
                 } else {
                   message.error('申请失败！')
                 }
               })
             }
-          }
-        })
-      }
-
-      // 基础设施--数据下发
-      const infrastructureConfirm = (item, falgNum, sxt) => {
-        let obj = {}
-        Object.assign(obj, formName)
-        console.log('摄像头===============>', obj, item)
-        obj.system = []
-        if (item.note1 && typeof item.note1 == 'string') {
-          item.note1 = JSON.parse(item.note1)
-        }
-        item.note1.map((sxt) => {
-          let _itemData = {
-            resourceId: sxt.idtCameraChannel + '',
-            resourceName: sxt.channelName,
-            cameraId: sxt.channelId, // 改接口后删除
-            channelCode: sxt.channelCode,
-            channelId: sxt.channelId,
-            channelName: sxt.channelName,
-            checkStatus: sxt.checkStatus + '',
-            gpsX: sxt.gpsX,
-            gpsY: sxt.gpsY,
-            idtCameraChannel: sxt.idtCameraChannel + '',
-            nodeName: sxt.nodeName,
-            parentId: sxt.parentId,
-            status: sxt.status + '',
-          }
-          // 西海岸
-          if (isXiHaiAn.value) {
-            _itemData.managementUnitName = sxt.managementUnitName
-            _itemData.cameraPointTypeName = sxt.cameraPointTypeName
-          }
-          obj.system.push(_itemData)
-        })
-        submitApply(obj).then((res) => {
-          // applySuccess.value = false
-          console.log('摄像头申请================>', res)
-          if (item.id) {
-            sgcDel({ ids: [item.id] }).then((res1) => {
-              if (res1.data.msg === 'success') {
-                if (falgNum == 0 && sxt) {
-                  message.success('申请提交成功，请到消息中心查看！')
-                  sxt = false
-                }
-                mybus.emit('getSgcNum')
+          } else {
+            formName.applicationSystem = ''
+            applyAllApplication(formName).then((res) => {
+              if (res.data.code == 0) {
+                message.success('申请提交成功，请到消息中心查看！')
                 jumpToDetailsPageconetent()
+              } else {
+                message.error('申请失败！')
               }
             })
-          } else {
-            if (res.data.msg === 'success' && falgNum == 0 && sxt) {
-              message.success('申请提交成功，请到消息中心查看！')
-              sxt = false
-            }
-            jumpToDetailsPageconetent()
           }
-        })
-      }
-
-      // 启动流程
-      const startProcess = (processDefinitionKey, businessKey, formData) => {
-        var data = {
-          processDefinitionKey: processDefinitionKey,
-          businessKey: businessKey,
-          variables: formData,
-        }
-        startOfBusinessKey(data)
-          .then(({ data: res }) => {
-            if (res.code !== 0) {
-              if (callbacks.startProcessErrorCallback) {
-                callbacks.startProcessErrorCallback(res.data)
-              }
-            }
-            message({
-              message: '操作成功',
-              type: 'success',
-              duration: 500,
-              onClose: () => {
-                if (callbacks.startProcessSuccessCallback) {
-                  callbacks.startProcessSuccessCallback(res.data)
-                }
-              },
-            })
-            if (instanceIdUrl) {
-              var params = qs.stringify({
-                processInstanceId: res.data.processInstanceId,
-                processDefinitionKey: processDefinitionKey,
-                businessKey: businessKey,
-              })
-              updateInstanceId(params).then(() => {})
-            }
-          })
-          .catch(() => {})
-      }
-      const options = ref([
-        {
-          value: '政法委',
-          label: '政法委',
-        },
-        {
-          value: '公安局',
-          label: '公安局',
-        },
-        {
-          value: '卫健委',
-          label: '卫健委',
-        },
-        {
-          value: '城市管理局',
-          label: '城市管理局',
-        },
-        {
-          value: '生态环境局',
-          label: '生态环境局',
-        },
-        {
-          value: '交通运输局',
-          label: '交通运输局',
-        },
-      ])
-      const systemOptions = ref([])
-      const systemOptions2 = ref([])
-      const handleChange = (info) => {
-        if (info.file.status !== 'uploading') {
-          // console.log(info.file, info.fileList)
-        }
-        if (info.file.status === 'done') {
-          message.success(`${info.file.name} 上传成功`)
-          formName.enclosure = info.file.response.data
-          formName.enclosureName = info.file.name
-        } else if (info.file.status === 'error') {
-          message.error(`${info.file.name} 上传失败`)
-        }
-      }
-      const beforeUpload = (file) => {
-        const isPNG =
-          file.type === 'image/png' ||
-          'image/doc' ||
-          'image/docx' ||
-          'image/jpg' ||
-          'image/png' ||
-          'image/jpeg' ||
-          'image/pdf' ||
-          'image/xlxs' ||
-          'image/ppt'
-        if (!isPNG) {
-          message.error(`上传失败`)
-        }
-        return isPNG || Upload.LIST_IGNORE
-      }
-      const fileList = ref([])
-      // 应用系统下拉
-      const systemHandleChange = (value) => {
-        console.log(`selected ${value}`)
-      }
-      const systemHandleSearch = (value) => {
-        let valueArray = []
-        systemOptions.value.map((val) => {
-          valueArray.push(val.value)
-        })
-        if (valueArray.indexOf(value) == -1) {
-          systemOptions.value.push({
-            value: value,
-            label: value,
-          })
-        }
-      }
-      pageWithAttrs({
-        pageNum: 1,
-        pageSize: 99999,
-        type: '应用资源',
-        name: '',
-        infoList: [],
-      }).then((res) => {
-        if (res.data.code == 0) {
-          if (res.data.data.records.length == 0) {
-            message.warning('该关键词，暂无应用资源！')
-          } else {
-            res.data.data.records.map((val) => {
-              systemOptions2.value.push({
-                value: val.name,
-                label: val.name,
-              })
-            })
-            // console.log('第一次获取===================>', systemOptions2.value)
-          }
-        } else {
-          message.error('应用系统获取数据失败!')
         }
       })
-      const handleBlur = () => {
-        console.log('blur')
-      }
-      const handleFocus = () => {
-        console.log('focus')
-        let arrId = []
-        for (var valueIndex of systemOptions2.value) {
-          if (arrId.indexOf(valueIndex['value']) == -1) {
-            arrId.push(valueIndex['value'])
-            systemOptions.value.push(valueIndex)
-          }
-        }
-      }
+    }
 
-      onBeforeUnmount(() => {
-        mybus.off('reomveOldData')
+    // 基础设施--数据下发
+    const infrastructureConfirm = (item, falgNum, sxt) => {
+      let obj = {}
+      Object.assign(obj, formName)
+      console.log('摄像头===============>', obj, item)
+      obj.system = []
+      if (item.note1 && typeof item.note1 == 'string') {
+        item.note1 = JSON.parse(item.note1)
+      }
+      item.note1.map((sxt) => {
+        let _itemData = {
+          resourceId: sxt.idtCameraChannel + '',
+          resourceName: sxt.channelName,
+          cameraId: sxt.channelId, // 改接口后删除
+          channelCode: sxt.channelCode,
+          channelId: sxt.channelId,
+          channelName: sxt.channelName,
+          checkStatus: sxt.checkStatus + '',
+          gpsX: sxt.gpsX,
+          gpsY: sxt.gpsY,
+          idtCameraChannel: sxt.idtCameraChannel + '',
+          nodeName: sxt.nodeName,
+          parentId: sxt.parentId,
+          status: sxt.status + '',
+        }
+        // 西海岸
+        if (isXiHaiAn.value) {
+          _itemData.managementUnitName = sxt.managementUnitName
+          _itemData.cameraPointTypeName = sxt.cameraPointTypeName
+        }
+        obj.system.push(_itemData)
       })
-
-      // 融合服务-更新
-      const updateIntegrationServiceAction = () => {
-        let _applyCount =
-          Number(integrationServicesItemInfo.value.applyCount || 0) + 1
-        let _data = Object.assign({}, integrationServicesItemInfo.value, {
-          applyCount: _applyCount,
-        })
-        updateIntegrationServices(_data)
-          .then((res) => {
-            console.log('res---更新--------->', res)
-          })
-          .catch((err) => {
-            console.log('err----更新-------->', err)
-          })
-      }
-
-      // 融合服务--详情
-      const getIntegrationServicesDeatil = (id) => {
-        return new Promise((resolve, reject) => {
-          getIntegrationDetail(id).then(
-            (res) => {
-              resolve(res)
-              if (res.data.code !== 0) {
-                return message.error(res.data.msg)
+      submitApply(obj).then((res) => {
+        // applySuccess.value = false
+        console.log('摄像头申请================>', res)
+        if (item.id) {
+          sgcDel({ ids: [item.id] }).then((res1) => {
+            if (res1.data.msg === 'success') {
+              if (falgNum == 0 && sxt) {
+                message.success('申请提交成功，请到消息中心查看！')
+                sxt = false
               }
-              integrationServicesItemInfo.value = res.data.data || {}
-            },
-            (err) => {
-              reject(err)
-              message.error(err)
-            }
-          )
-        })
-      }
-
-      // 西海岸：单兵设备、无人机提交申请
-      const handleWrjApply = (formName) => {
-        let _data = {
-          deviceId:
-            formName.system &&
-            formName.system[0] &&
-            formName.system[0].resourceId,
-          deviceName:
-            formName.system &&
-            formName.system[0] &&
-            formName.system[0].resourceName,
-          title: formName.title,
-          name: formName.user,
-          phone: formName.phone,
-          dept: formName.unit, // 单位
-          applicationSystem: formName.applicationSystem, // 应用系统
-          applicationArea: JSON.stringify(formName.applicationScene), // 应用领域
-          demand: formName.applicationBackground, // 需求依据
-        }
-        soldierApply(_data)
-          .then((res) => {
-            if (res.data.code == 0) {
-              message.success(res.data.msg)
+              mybus.emit('getSgcNum')
               jumpToDetailsPageconetent()
-            } else {
-              message.error('申请失败！')
             }
           })
-          .catch((err) => {
-            message.error(err)
-          })
-      }
+        } else {
+          if (res.data.msg === 'success' && falgNum == 0 && sxt) {
+            message.success('申请提交成功，请到消息中心查看！')
+            sxt = false
+          }
+          jumpToDetailsPageconetent()
+        }
+      })
+    }
 
-      return {
-        deptIdChangeFunction,
-        formRef,
-        formName,
-        deptNameAll,
-        instanceIdUrl,
-        formUrl,
-        processStartHandle,
-        resetFields,
-        startProcess,
-        options,
-        fileList,
-        list,
-        deptFlage,
-        headers: {
-          authorization: 'authorization-text',
-        },
-        handleChange,
-        applySuccess,
-        disabled,
-        baseURL,
-        beforeUpload,
-        dataList,
-        systemHandleChange,
-        systemHandleSearch,
-        handleBlur,
-        handleFocus,
-        systemOptions,
-        applicationSceneOpthion,
-        flag,
-        applyAll,
-        getIntegrationServicesDeatil,
-        isCamera,
-        isXiHaiAn,
-        expireDateOptions,
+    // 启动流程
+    const startProcess = (processDefinitionKey, businessKey, formData) => {
+      var data = {
+        processDefinitionKey: processDefinitionKey,
+        businessKey: businessKey,
+        variables: formData,
       }
-    },
-  }
+      startOfBusinessKey(data)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            if (callbacks.startProcessErrorCallback) {
+              callbacks.startProcessErrorCallback(res.data)
+            }
+          }
+          message({
+            message: '操作成功',
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              if (callbacks.startProcessSuccessCallback) {
+                callbacks.startProcessSuccessCallback(res.data)
+              }
+            },
+          })
+          if (instanceIdUrl) {
+            var params = qs.stringify({
+              processInstanceId: res.data.processInstanceId,
+              processDefinitionKey: processDefinitionKey,
+              businessKey: businessKey,
+            })
+            updateInstanceId(params).then(() => { })
+          }
+        })
+        .catch(() => { })
+    }
+    const options = ref([
+      {
+        value: '政法委',
+        label: '政法委',
+      },
+      {
+        value: '公安局',
+        label: '公安局',
+      },
+      {
+        value: '卫健委',
+        label: '卫健委',
+      },
+      {
+        value: '城市管理局',
+        label: '城市管理局',
+      },
+      {
+        value: '生态环境局',
+        label: '生态环境局',
+      },
+      {
+        value: '交通运输局',
+        label: '交通运输局',
+      },
+    ])
+    const systemOptions = ref([])
+    const systemOptions2 = ref([])
+    const handleChange = (info) => {
+      if (info.file.status !== 'uploading') {
+        // console.log(info.file, info.fileList)
+      }
+      if (info.file.status === 'done') {
+        message.success(`${info.file.name} 上传成功`)
+        formName.enclosure = info.file.response.data
+        formName.enclosureName = info.file.name
+      } else if (info.file.status === 'error') {
+        message.error(`${info.file.name} 上传失败`)
+      }
+    }
+    const beforeUpload = (file) => {
+      const isPNG =
+        file.type === 'image/png' ||
+        'image/doc' ||
+        'image/docx' ||
+        'image/jpg' ||
+        'image/png' ||
+        'image/jpeg' ||
+        'image/pdf' ||
+        'image/xlxs' ||
+        'image/ppt'
+      if (!isPNG) {
+        message.error(`上传失败`)
+      }
+      return isPNG || Upload.LIST_IGNORE
+    }
+    const fileList = ref([])
+    // 应用系统下拉
+    const systemHandleChange = (value) => {
+      console.log(`selected ${value}`)
+    }
+    const systemHandleSearch = (value) => {
+      let valueArray = []
+      systemOptions.value.map((val) => {
+        valueArray.push(val.value)
+      })
+      if (valueArray.indexOf(value) == -1) {
+        systemOptions.value.push({
+          value: value,
+          label: value,
+        })
+      }
+    }
+    pageWithAttrs({
+      pageNum: 1,
+      pageSize: 99999,
+      type: '应用资源',
+      name: '',
+      infoList: [],
+    }).then((res) => {
+      if (res.data.code == 0) {
+        if (res.data.data.records.length == 0) {
+          message.warning('该关键词，暂无应用资源！')
+        } else {
+          res.data.data.records.map((val) => {
+            systemOptions2.value.push({
+              value: val.name,
+              label: val.name,
+            })
+          })
+          // console.log('第一次获取===================>', systemOptions2.value)
+        }
+      } else {
+        message.error('应用系统获取数据失败!')
+      }
+    })
+    const handleBlur = () => {
+      console.log('blur')
+    }
+    const handleFocus = () => {
+      console.log('focus')
+      let arrId = []
+      for (var valueIndex of systemOptions2.value) {
+        if (arrId.indexOf(valueIndex['value']) == -1) {
+          arrId.push(valueIndex['value'])
+          systemOptions.value.push(valueIndex)
+        }
+      }
+    }
+
+    onBeforeUnmount(() => {
+      mybus.off('reomveOldData')
+    })
+
+    // 融合服务-更新
+    const updateIntegrationServiceAction = () => {
+      let _applyCount =
+        Number(integrationServicesItemInfo.value.applyCount || 0) + 1
+      let _data = Object.assign({}, integrationServicesItemInfo.value, {
+        applyCount: _applyCount,
+      })
+      updateIntegrationServices(_data)
+        .then((res) => {
+          console.log('res---更新--------->', res)
+        })
+        .catch((err) => {
+          console.log('err----更新-------->', err)
+        })
+    }
+
+    // 融合服务--详情
+    const getIntegrationServicesDeatil = (id) => {
+      return new Promise((resolve, reject) => {
+        getIntegrationDetail(id).then(
+          (res) => {
+            resolve(res)
+            if (res.data.code !== 0) {
+              return message.error(res.data.msg)
+            }
+            integrationServicesItemInfo.value = res.data.data || {}
+          },
+          (err) => {
+            reject(err)
+            message.error(err)
+          }
+        )
+      })
+    }
+
+    // 西海岸：单兵设备、无人机提交申请
+    const handleWrjApply = (formName) => {
+      let _data = {
+        deviceId:
+          formName.system &&
+          formName.system[0] &&
+          formName.system[0].resourceId,
+        deviceName:
+          formName.system &&
+          formName.system[0] &&
+          formName.system[0].resourceName,
+        title: formName.title,
+        name: formName.user,
+        phone: formName.phone,
+        dept: formName.unit, // 单位
+        applicationSystem: formName.applicationSystem, // 应用系统
+        applicationArea: JSON.stringify(formName.applicationScene), // 应用领域
+        demand: formName.applicationBackground, // 需求依据
+      }
+      soldierApply(_data)
+        .then((res) => {
+          if (res.data.code == 0) {
+            message.success(res.data.msg)
+            jumpToDetailsPageconetent()
+          } else {
+            message.error('申请失败！')
+          }
+        })
+        .catch((err) => {
+          message.error(err)
+        })
+    }
+
+    return {
+      deptIdChangeFunction,
+      formRef,
+      formName,
+      deptNameAll,
+      instanceIdUrl,
+      formUrl,
+      processStartHandle,
+      resetFields,
+      startProcess,
+      options,
+      fileList,
+      list,
+      deptFlage,
+      headers: {
+        authorization: 'authorization-text',
+      },
+      handleChange,
+      applySuccess,
+      disabled,
+      baseURL,
+      beforeUpload,
+      dataList,
+      systemHandleChange,
+      systemHandleSearch,
+      handleBlur,
+      handleFocus,
+      systemOptions,
+      applicationSceneOpthion,
+      flag,
+      applyAll,
+      getIntegrationServicesDeatil,
+      isCamera,
+      isXiHaiAn,
+      expireDateOptions,
+    }
+  },
+}
 </script>
 <style scoped lang="less">
-  #apply-container {
-    // background-color: #f5f8fc;
-    height: 100%;
-    width: 100%;
-    margin: 0.8rem auto 0;
+#apply-container {
+  // background-color: #f5f8fc;
+  height: 100%;
+  width: 100%;
+  margin: 0.8rem auto 0;
+  display: flex;
+  justify-content: space-between;
+
+  aside {
+    width: 282px;
+    height: 96%;
+    overflow-y: auto;
+    background-color: #fff;
+    margin: 1% 0 3%;
+  }
+
+  article {
+    width: 1090px;
+    height: 99%;
+    overflow-y: auto;
+    background-color: #fff;
+    margin: 1% auto;
+  }
+
+  .form-container {
+    padding: 20px 20px 30px 20px;
+
+    .title {
+      font-size: 20px;
+      color: #000;
+      font-weight: bold;
+      margin-bottom: 20px;
+    }
+  }
+
+  .base-info {
     display: flex;
     justify-content: space-between;
+  }
 
-    aside {
-      width: 282px;
-      height: 96%;
-      overflow-y: auto;
-      background-color: #fff;
-      margin: 1% 0 3%;
-    }
+  .flex-row-start {
+    justify-content: flex-start;
+    align-items: center;
+  }
 
-    article {
-      width: 1090px;
-      height: 99%;
-      overflow-y: auto;
-      background-color: #fff;
-      margin: 1% auto;
-    }
+  :deep(.ant-form-item-label) {
+    label {
+      color: #666;
+      font-size: 16px;
 
-    .form-container {
-      padding: 20px 20px 30px 20px;
-
-      .title {
-        font-size: 20px;
-        color: #000;
-        font-weight: bold;
-        margin-bottom: 20px;
+      &::after {
+        content: '';
       }
     }
-
-    .base-info {
-      display: flex;
-      justify-content: space-between;
-    }
-
-    .flex-row-start {
-      justify-content: flex-start;
-      align-items: center;
-    }
-
-    :deep(.ant-form-item-label) {
-      label {
-        color: #666;
-        font-size: 16px;
-
-        &::after {
-          content: '';
-        }
-      }
-    }
-
-    :deep(.ant-form-item-required) {
-      &::before {
-        font-size: 8px;
-        margin-right: 10px;
-      }
-    }
-
-    :deep(.ant-input) {
-      border: 1px solid #e0e0e0;
-      border-radius: 6px;
-    }
-
-    .success {
-      div {
-        width: 100px;
-        margin: 80px auto 40px;
-      }
-
-      text-align: center;
-      font-size: 20px;
-      font-weight: bold;
-      color: #000;
-    }
   }
 
-  .applicationScene {
-    :deep(.ant-select-selector) {
-      overflow-x: scroll;
-    }
-
-    :deep(.ant-select-selection-overflow) {
-      flex-wrap: nowrap;
+  :deep(.ant-form-item-required) {
+    &::before {
+      font-size: 8px;
+      margin-right: 10px;
     }
   }
 
-  textarea {
-    resize: none;
-    font-size: 14px;
+  :deep(.ant-input) {
+    border: 1px solid #e0e0e0;
+    border-radius: 6px;
   }
 
-  .bottom-btn {
-    display: flex;
-    justify-content: center;
-    // position: fixed;
+  .success {
+    div {
+      width: 100px;
+      margin: 80px auto 40px;
+    }
+
+    text-align: center;
+    font-size: 20px;
+    font-weight: bold;
+    color: #000;
   }
+}
+
+.applicationScene {
+  :deep(.ant-select-selector) {
+    overflow-x: scroll;
+  }
+
+  :deep(.ant-select-selection-overflow) {
+    flex-wrap: nowrap;
+  }
+}
+
+textarea {
+  resize: none;
+  font-size: 14px;
+}
+
+.bottom-btn {
+  display: flex;
+  justify-content: center;
+  // position: fixed;
+}
 </style>

From 1d5d4845c22e5bc234a93e7024ad918379a18277 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Mon, 3 Oct 2022 15:46:11 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E5=B8=82=E5=B1=80=EF=BC=9A=E8=83=BD?=
 =?UTF-8?q?=E5=8A=9B=E7=BB=9F=E8=AE=A1=EF=BC=8C=E9=83=A8=E9=97=A8=E6=95=B0?=
 =?UTF-8?q?=E6=BC=8F=E6=96=97=E5=9B=BE=E6=9B=B4=E6=94=B9=EF=BC=8C=E8=A6=86?=
 =?UTF-8?q?=E7=9B=96=E9=83=A8=E9=97=A8=E9=87=8F=E6=9B=B4=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=B1=87=E8=81=9A=E9=83=A8=E9=97=A8=E9=87=8F?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8E=E9=83=A8=E9=97=A8=E6=80=BB=E6=95=B0=E4=BF=9D?=
 =?UTF-8?q?=E6=8C=81=E4=B8=80=E7=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ResourceAggregation.vue        | 1044 +++++++++--------
 1 file changed, 552 insertions(+), 492 deletions(-)

diff --git a/front/src/views/abilityStatistics/components/ResourceAggregation.vue b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
index 4ef65f01..50f850f7 100644
--- a/front/src/views/abilityStatistics/components/ResourceAggregation.vue
+++ b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
@@ -11,12 +11,9 @@
           <div v-for="item in dataList.dataList" :key="item.name">
             <div v-if="item.type !== '资源汇聚总量'" class="content-left">
               <div class="name">
-                <span
-                  class="name-photo"
-                  :style="{
-                    backgroundImage: `url(${item.photo}) `,
-                  }"
-                ></span>
+                <span class="name-photo" :style="{
+                  backgroundImage: `url(${item.photo}) `,
+                }"></span>
                 <span class="name-text">{{ item.type }}</span>
               </div>
               <div class="organization-value">
@@ -55,516 +52,579 @@
   </div>
 </template>
 <script setup>
-  import { ref, onMounted, watch } from 'vue'
-  import { selectTotal } from '@/api/home'
-  import {
-    // numberOfResourcesByCategory,
-    sourceDepartmentStatistics,
-  } from '@/api/abilityStatistics.js'
-  // import { zywMessage } from '@/api/home'
-  import * as echarts from 'echarts'
-  //各类资源汇聚量
-  let dataList = ref({
-    title: '各类资源汇聚量',
-    dataList: [],
-  })
-  // let photo = ref([
-  //   require('../../../assets/abilityStatistics/banner-jc.png'),
-  //   require('../../../assets/abilityStatistics/banner-sj.png'),
-  //   require('../../../assets/abilityStatistics/banner-zj.png'),
-  //   require('../../../assets/abilityStatistics/banner-yy.png'),
-  //   require('../../../assets/abilityStatistics/banner-zs.png'),
-  // ])
-  // let name = ref([])
-  // 获取数据资源数据
-  // const findZywMessage = () => {
-  //   zywMessage().then((res) => {
-  //     const { data } = res.data
-  //     dataSourceNum.value = data.sxmlcount || 0
-  //     snum()
-  //   })
-  // }
-  //各类资源数目接口
-  // function snum() {
-  //   numberOfResourcesByCategory().then((res) => {
-  //     dataList.value.dataList = res.data.data
-  //     res.data.data.map((item, index) => {
-  //       // if (dataList.value.dataList[index].type === '数据资源') {
-  //       //   dataList.value.dataList[index].amount = dataSourceNum.value || 0
-  //       // }
-  //       dataList.value.dataList[index].organization = '个'
-  //       dataList.value.dataList[index].photo = photo.value[index]
-  //     })
-  //   })
-  // }
-  selectTotal().then((res) => {
-    console.log('selectTotal===============>', res.data.data)
-    // res.data.data.map((item, index) => {
-    //   dataList.value.dataList[index].organization = '个'
-    //   dataList.value.dataList[index].photo = photo.value[index]
-    // })
-    res.data.data.total.forEach((val) => {
-      switch (val.type) {
-        case '组件服务':
-          dataList.value.dataList.push({
-            organization: '个',
-            type: '组件服务',
-            photo: require('../../../assets/abilityStatistics/banner-zj.png'),
-            amount: val.count,
-          })
-          break
-        case '应用资源':
-          dataList.value.dataList.push({
-            organization: '个',
-            type: '应用资源',
-            photo: require('../../../assets/abilityStatistics/banner-yy.png'),
-            amount: val.count,
-          })
-          break
-        case '基础设施':
-          if (uavAndIndividualSoldier.num) {
-            val.count = val.count - 0 + uavAndIndividualSoldier.num
-          }
-          dataList.value.dataList.push({
-            organization: '个',
-            type: '基础设施',
-            photo: require('../../../assets/abilityStatistics/banner-jc.png'),
-            amount: val.count,
-          })
-          break
-        case '数据资源':
-          dataList.value.dataList.push({
-            organization: '个',
-            type: '数据资源',
-            photo: require('../../../assets/abilityStatistics/banner-sj.png'),
-            amount: val.count,
-          })
-          break
-        case '知识库':
-          dataList.value.dataList.push({
-            organization: '个',
-            type: '知识库',
-            photo: require('../../../assets/abilityStatistics/banner-zs.png'),
-            amount: val.count,
-          })
-          break
-      }
-    })
-    let arr = ['组件服务', '应用资源', '基础设施', '数据资源', '知识库']
-    dataList.value.dataList.sort((a, b) => {
-      return arr.indexOf(a.type) - arr.indexOf(b.type)
-    })
-  })
-  let datas = ref([])
-  let laiyuanDataList = ref([])
-  // let dataSourceNum = ref(0)
-  let bumenSum = ref([])
-
-  //能力统计-来源部门统计接口
-  const sourceDepartment = () => {
-    sourceDepartmentStatistics().then((res) => {
-      // datas.value = res.data.data.deptTypeCount
-      bumenSum.value = res.data.data.deptCount
-      for (const key in res.data.data.deptTypeCount) {
-        datas.value.push({
-          name: key,
-          value: res.data.data.deptTypeCount[key],
-        })
-      }
-      let fanwei = ref([])
-      for (const key in res.data.data.deptTotalCount) {
-        laiyuanDataList.value.push({
-          name: res.data.data.deptTotalCount[key],
-          value: res.data.data.deptTotalCount[key],
-          fanwei: '',
-        })
-        fanwei.value.push(key)
-        fanwei.value.map((item, index) => {
-          if (index + 1 < fanwei.value.length) {
-            laiyuanDataList.value[index].fanwei =
-              item + '-' + fanwei.value[index + 1]
-          } else {
-            laiyuanDataList.value[index].fanwei = item + '以上'
-          }
-        })
-      }
-      console.log('laiyuanDataList.value', laiyuanDataList.value)
-    })
+import { ref, onMounted, watch } from 'vue'
+import { selectTotal } from '@/api/home'
+import {
+  // numberOfResourcesByCategory,
+  sourceDepartmentStatistics,
+} from '@/api/abilityStatistics.js'
+// import { zywMessage } from '@/api/home'
+import * as echarts from 'echarts'
+//各类资源汇聚量
+let dataList = ref({
+  title: '各类资源汇聚量',
+  dataList: [],
+})
+// let photo = ref([
+//   require('../../../assets/abilityStatistics/banner-jc.png'),
+//   require('../../../assets/abilityStatistics/banner-sj.png'),
+//   require('../../../assets/abilityStatistics/banner-zj.png'),
+//   require('../../../assets/abilityStatistics/banner-yy.png'),
+//   require('../../../assets/abilityStatistics/banner-zs.png'),
+// ])
+// let name = ref([])
+// 获取数据资源数据
+// const findZywMessage = () => {
+//   zywMessage().then((res) => {
+//     const { data } = res.data
+//     dataSourceNum.value = data.sxmlcount || 0
+//     snum()
+//   })
+// }
+//各类资源数目接口
+// function snum() {
+//   numberOfResourcesByCategory().then((res) => {
+//     dataList.value.dataList = res.data.data
+//     res.data.data.map((item, index) => {
+//       // if (dataList.value.dataList[index].type === '数据资源') {
+//       //   dataList.value.dataList[index].amount = dataSourceNum.value || 0
+//       // }
+//       dataList.value.dataList[index].organization = '个'
+//       dataList.value.dataList[index].photo = photo.value[index]
+//     })
+//   })
+// }
+selectTotal().then((res) => {
+  console.log('selectTotal===============>', res.data.data)
+  // res.data.data.map((item, index) => {
+  //   dataList.value.dataList[index].organization = '个'
+  //   dataList.value.dataList[index].photo = photo.value[index]
+  // })
+  let imgObj = {
+    '组件服务': require('../../../assets/abilityStatistics/banner-zj.png'),
+    '应用资源': require('../../../assets/abilityStatistics/banner-yy.png'),
+    '基础设施': require('../../../assets/abilityStatistics/banner-jc.png'),
+    '数据资源': require('../../../assets/abilityStatistics/banner-sj.png'),
+    '知识库': require('../../../assets/abilityStatistics/banner-zs.png'),
   }
-  //来源部门饼图
-  let leftDom = ref(0)
-  const pieCharti = (dataLists) => {
-    leftDom.value += 'a'
-    echarts.init(document.getElementById('left')).dispose()
-    let chartDom = document.getElementById('left')
-    let myChart = echarts.init(chartDom)
-    let option
-    let index = -1
-    option = {
-      title: {
-        // text: '区级占比',
-        x: 'center',
-        y: '35%',
-        textStyle: {
-          fontWeight: 'normal',
-          fontSize: 16,
-        },
-      },
-      tooltip: {
-        show: true,
-        trigger: 'item',
-        formatter: '{b}: {c} ({d}%)',
-      },
-      legend: {
-        icon: 'emptyCircle',
-        height: 3,
-        itemGap: 40,
-        // orient: 'horizontal',
-        bottom: 0,
-        formatter: function (name) {
-          if (index < 4) {
-            index += 1
-          }
-          let dom = ref()
-          datas.value.map((item) => {
-            if (item.name == name) {
-              dom.value = name + '  ' + item.value
-            }
-          })
-          return dom.value
-        },
-      },
-      series: [
-        {
-          center: ['50%', '40%'],
-          type: 'pie',
-          selectedMode: 'single',
-          radius: ['50%', '30%'],
-          color: ['#fe845e', '#6cc95a', '#02d1b0', '#1772ff', '#FAC858'],
-          top: '0',
-          label: {
-            normal: {
-              show: false,
-              position: 'inner',
-              formatter: '{d}%',
-
-              // textStyle: {
-              //   color: '#fff',
-              //   fontWeight: 'bold',
-              //   fontSize: 14,
-              // },
-            },
-          },
-          labelLine: {
-            normal: {
-              show: false,
-            },
-          },
-          data: dataLists,
-        },
-        {
-          type: 'pie',
-          center: ['50%', '40%'],
-          radius: ['58%', '50%'],
-          itemStyle: {
-            normal: {
-              color: '#c2c7d6',
-            },
-            emphasis: {
-              color: '#ADADAD',
-            },
-          },
-          label: {
-            normal: {
-              position: 'inner',
-              formatter: '{c}',
-              textStyle: {
-                color: '#777777',
-                fontWeight: 'bold',
-                fontSize: 14,
-              },
-            },
-          },
-          // data: dataLists,
-        },
-      ],
+  res.data.data.total.forEach((val) => {
+    let _obj = {
+      organization: '个',
+      type: val.type,
+      photo: val.type && imgObj[val.type],
+      amount: val.count,
     }
+    if (val.type == '基础设施') {
+      if (uavAndIndividualSoldier.num) {
+        _obj.amount = val.count - 0 + uavAndIndividualSoldier.num
+      }
+    }
+    dataList.value.dataList.push(_obj)
+    // switch (val.type) {
+    //   case '组件服务':
+    //     dataList.value.dataList.push({
+    //       organization: '个',
+    //       type: '组件服务',
+    //       photo: require('../../../assets/abilityStatistics/banner-zj.png'),
+    //       amount: val.count,
+    //     })
+    //     break
+    //   case '应用资源':
+    //     dataList.value.dataList.push({
+    //       organization: '个',
+    //       type: '应用资源',
+    //       photo: require('../../../assets/abilityStatistics/banner-yy.png'),
+    //       amount: val.count,
+    //     })
+    //     break
+    //   case '基础设施':
+    //     if (uavAndIndividualSoldier.num) {
+    //       val.count = val.count - 0 + uavAndIndividualSoldier.num
+    //     }
+    //     dataList.value.dataList.push({
+    //       organization: '个',
+    //       type: '基础设施',
+    //       photo: require('../../../assets/abilityStatistics/banner-jc.png'),
+    //       amount: val.count,
+    //     })
+    //     break
+    //   case '数据资源':
+    //     dataList.value.dataList.push({
+    //       organization: '个',
+    //       type: '数据资源',
+    //       photo: require('../../../assets/abilityStatistics/banner-sj.png'),
+    //       amount: val.count,
+    //     })
+    //     break
+    //   case '知识库':
+    //     dataList.value.dataList.push({
+    //       organization: '个',
+    //       type: '知识库',
+    //       photo: require('../../../assets/abilityStatistics/banner-zs.png'),
+    //       amount: val.count,
+    //     })
+    //     break
+    // }
+  })
+  let arr = ['组件服务', '应用资源', '基础设施', '数据资源', '知识库']
+  dataList.value.dataList.sort((a, b) => {
+    return arr.indexOf(a.type) - arr.indexOf(b.type)
+  })
+})
+let datas = ref([])
+let laiyuanDataList = ref([])
+// let dataSourceNum = ref(0)
+let bumenSum = ref([])
 
-    option && myChart.setOption(option)
-  }
-  //来源部门漏斗图
-  const funnelPlot = (dataList) => {
-    // let arr = ['0-5', '5-10', '10-15', '15-20', '20以上']
-    // dataList.sort((a, b) => {
-    //   console.log(arr.indexOf(a.fanwei), arr.indexOf(b.fanwei))
-    //   return arr.indexOf(b.fanwei) - arr.indexOf(a.fanwei)
-    // })
-    console.log('============》', dataList)
-    echarts.init(document.getElementById('right')).dispose()
-    let chartDom = document.getElementById('right')
-    let myChart = echarts.init(chartDom)
-    let option
+//能力统计-来源部门统计接口
+const sourceDepartment = () => {
+  sourceDepartmentStatistics().then((res) => {
+    // datas.value = res.data.data.deptTypeCount
+    bumenSum.value = res.data.data.deptCount
+    for (const key in res.data.data.deptTypeCount) {
+      datas.value.push({
+        name: key,
+        value: res.data.data.deptTypeCount[key],
+      })
+    }
+    let fanwei = ref([])
+    for (const key in res.data.data.deptTotalCount) {
+      laiyuanDataList.value.push({
+        name: res.data.data.deptTotalCount[key],
+        value: res.data.data.deptTotalCount[key],
+        fanwei: '',
+      })
+      fanwei.value.push(key)
+      fanwei.value.map((item, index) => {
+        if (index + 1 < fanwei.value.length) {
+          laiyuanDataList.value[index].fanwei =
+            item + '-' + fanwei.value[index + 1]
+        } else {
+          laiyuanDataList.value[index].fanwei = item + '以上'
+        }
+      })
+    }
+    console.log('laiyuanDataList.value', laiyuanDataList.value)
+  })
+}
+//来源部门饼图
+let leftDom = ref(0)
+const pieCharti = (dataLists) => {
+  leftDom.value += 'a'
+  echarts.init(document.getElementById('left')).dispose()
+  let chartDom = document.getElementById('left')
+  let myChart = echarts.init(chartDom)
+  let option
+  let index = -1
+  option = {
+    title: {
+      // text: '区级占比',
+      x: 'center',
+      y: '35%',
+      textStyle: {
+        fontWeight: 'normal',
+        fontSize: 16,
+      },
+    },
+    tooltip: {
+      show: true,
+      trigger: 'item',
+      formatter: '{b}: {c} ({d}%)',
+    },
+    legend: {
+      icon: 'emptyCircle',
+      height: 3,
+      itemGap: 40,
+      // orient: 'horizontal',
+      bottom: 0,
+      formatter: function (name) {
+        if (index < 4) {
+          index += 1
+        }
+        let dom = ref()
+        datas.value.map((item) => {
+          if (item.name == name) {
+            dom.value = name + '  ' + item.value
+          }
+        })
+        return dom.value
+      },
+    },
+    series: [
+      {
+        center: ['50%', '40%'],
+        type: 'pie',
+        selectedMode: 'single',
+        radius: ['50%', '30%'],
+        color: ['#fe845e', '#6cc95a', '#02d1b0', '#1772ff', '#FAC858'],
+        top: '0',
+        label: {
+          normal: {
+            show: false,
+            position: 'inner',
+            formatter: '{d}%',
 
-    option = {
-      // title: {
-      //   text: '汇聚量',
-      // },
-      tooltip: {
-        trigger: 'item',
-        formatter: function (name) {
-          let dom = ref()
-          dom.value =
-            '部门数<br/>' + name.data.fanwei + ' : ' + name.data.value + '个'
-          console.log('name', name.data)
-          return dom.value
+            // textStyle: {
+            //   color: '#fff',
+            //   fontWeight: 'bold',
+            //   fontSize: 14,
+            // },
+          },
         },
-      },
-      grid: {
-        height: '65%',
-        width: '45%',
-        left: '20%',
-        bottom: 30,
-      },
-      xAxis: {
-        show: false,
-        type: 'category',
-        data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
-      },
-      yAxis: {
-        show: false,
-        type: 'value',
-        min: 0,
-        max: 20,
-      },
-      series: [
-        {
-          name: '部门数',
-          type: 'funnel',
-          left: '20%',
-          top: '10%',
-          width: '60%',
-          height: '80%',
-          min: 0,
-          max: 100,
-          minSize: '0%',
-          maxSize: '100%',
-          sort: 'ascending',
-          gap: 2,
-          label: {
-            show: true,
-            position: 'inside',
+        labelLine: {
+          normal: {
+            show: false,
           },
-          labelLine: {
-            length: 10,
-            lineStyle: {
-              width: 1,
-              type: 'solid',
-            },
-          },
-          itemStyle: {
-            borderColor: '#fff',
-            borderWidth: 1,
+        },
+        data: dataLists,
+      },
+      {
+        type: 'pie',
+        center: ['50%', '40%'],
+        radius: ['58%', '50%'],
+        itemStyle: {
+          normal: {
+            color: '#c2c7d6',
           },
           emphasis: {
-            label: {
-              fontSize: 20,
+            color: '#ADADAD',
+          },
+        },
+        label: {
+          normal: {
+            position: 'inner',
+            formatter: '{c}',
+            textStyle: {
+              color: '#777777',
+              fontWeight: 'bold',
+              fontSize: 14,
             },
           },
-          data: dataList,
         },
-        {
-          data: [],
-          type: 'bar',
-        },
-      ],
-    }
-
-    option && myChart.setOption(option)
+        // data: dataLists,
+      },
+    ],
   }
-  onMounted(() => {
-    // findZywMessage()
-    // snum()
-    sourceDepartment()
+
+  option && myChart.setOption(option)
+}
+//来源部门漏斗图
+const funnelPlot = (dataList) => {
+  // 排序
+  let arrCopy = ['0-5', '5-10', '10-15', '15-20', '20以上']
+  // 真实数据
+  dataList.sort((a, b) => {
+    console.log(arrCopy.indexOf(a.fanwei), arrCopy.indexOf(b.fanwei))
+    return arrCopy.indexOf(b.fanwei) - arrCopy.indexOf(a.fanwei)
   })
-  watch(
-    datas,
-    (value) => {
-      pieCharti(value)
+  let _arr = dataList.map(v => v.fanwei) || arrCopy;
+  // 数据配置形成金字塔形状固定
+  let chartData = _arr.map((v, i) => {
+    return {
+      name: v,
+      value: 10 + 10 * i,
+    }
+  })
+
+  let newArr = [];
+  dataList.map(v => {
+    if (v.value && Number(v.value > 0)) {
+      newArr.push({
+        name: v.fanwei,
+        value: v.value
+      })
+    }
+  })
+  console.log('============》', dataList)
+  echarts.init(document.getElementById('right')).dispose()
+  let chartDom = document.getElementById('right')
+  let myChart = echarts.init(chartDom)
+  let option = {
+    tooltip: {
+      trigger: 'item',
+      formatter: function (info) {
+        let _obj = dataList.find(v => v.fanwei == info.data.name) || {}
+        let dom = ref()
+        dom.value =
+          '部门数<br/>' + (_obj.fanwei || '--') + ' : ' + (_obj.value || _obj.value === 0 ? _obj.value : '--') + '个'
+        console.log('name', info.data)
+        return dom.value
+      },
     },
-    { deep: true }
-  )
-  watch(
-    laiyuanDataList,
-    (value) => {
-      funnelPlot(value)
-      console.log(value, '   laiyuanDataList')
+    grid: {
+      height: '65%',
+      width: '45%',
+      left: '20%',
+      bottom: 30,
     },
-    { deep: true }
-  )
+    xAxis: {
+      show: false,
+      type: 'category',
+      data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+    },
+    yAxis: {
+      show: false,
+      type: 'value',
+      min: 0,
+      max: 20,
+    },
+    series: [
+      {
+        name: '部门数',
+        type: 'funnel',
+        left: '28%',
+        right: '35%',
+        top: '15%',
+        bottom: '10%',
+        minSize: '0%',
+        maxSize: '100%',
+        sort: 'ascending',
+        label: {
+          show: true,
+          formatter: function (info) {
+            let _obj = dataList.find(v => v.fanwei == info.data.name) || {}
+            let dom = ref()
+            dom.value = (_obj.fanwei || '--') + ' : ' + (_obj.value || _obj.value === 0 ? _obj.value : '--') + '个';
+            console.log('name', info.data)
+            return dom.value
+          },
+          rich: {
+            b: {
+              fontSize: 14
+            }
+          }
+        },
+        labelLine: {
+          length: 40,
+          lineStyle: {
+            width: 1,
+            type: 'solid'
+          }
+        },
+        itemStyle: {
+          borderColor: '#fff',
+          borderWidth: 1,
+        },
+        emphasis: {
+          label: {
+            fontSize: 20,
+          },
+        },
+        data: chartData,
+      }
+    ],
+  }
+
+  option && myChart.setOption(option)
+}
+onMounted(() => {
+  // findZywMessage()
+  // snum()
+  sourceDepartment()
+})
+watch(
+  datas,
+  (value) => {
+    pieCharti(value)
+  },
+  { deep: true }
+)
+watch(
+  laiyuanDataList,
+  (value) => {
+    funnelPlot(value)
+    console.log(value, '   laiyuanDataList')
+  },
+  { deep: true }
+)
 </script>
 <style lang="less" scoped>
-  @font-face {
-    font-family: 'num-typeface';
-    src: url('~@/assets/newHome/font/num-typeface.otf');
-  }
-  @font-face {
-    font-family: 'text-typeface';
-    src: url('~@/assets/newHome/font/text-typeface.otf');
-  }
-  .num {
-    font-family: num-typeface;
-    font-size: 32px;
-    font-weight: 600;
-    margin-right: 5px;
-  }
-  .hengxian {
-    height: 3px;
-    width: 30px;
-    border-radius: 1px;
-    margin-top: 6px;
-    background: #0058e1;
-  }
-  .resource-aggregation {
-    font-size: 18px;
-    font-family: text-typeface;
-    width: 100%;
-    display: flex;
-    justify-content: center;
-    background: #f3f5f9;
-    padding-bottom: 60px;
-    .resource-aggregation-left {
-      background: #fff;
-      border: 1px solid #e6e9ed;
-      border-radius: 2px;
-      box-shadow: 0 4px 20px rgba(233, 233, 233, 0.1);
-      width: 360px;
-      height: 397px;
-      padding: 20px;
-      padding-top: 64px;
-      position: relative;
-      .title {
-        position: absolute;
-        top: 20px;
-        font-size: 18px;
-        color: #212121;
-      }
-      .content {
-        .content-son {
-          .content-left {
-            margin-bottom: 8px;
-            height: 56px;
-            width: 320px;
-            background: #f1f4fb;
+@font-face {
+  font-family: 'num-typeface';
+  src: url('~@/assets/newHome/font/num-typeface.otf');
+}
+
+@font-face {
+  font-family: 'text-typeface';
+  src: url('~@/assets/newHome/font/text-typeface.otf');
+}
+
+.num {
+  font-family: num-typeface;
+  font-size: 32px;
+  font-weight: 600;
+  margin-right: 5px;
+}
+
+.hengxian {
+  height: 3px;
+  width: 30px;
+  border-radius: 1px;
+  margin-top: 6px;
+  background: #0058e1;
+}
+
+.resource-aggregation {
+  font-size: 18px;
+  font-family: text-typeface;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  background: #f3f5f9;
+  padding-bottom: 60px;
+
+  .resource-aggregation-left {
+    background: #fff;
+    border: 1px solid #e6e9ed;
+    border-radius: 2px;
+    box-shadow: 0 4px 20px rgba(233, 233, 233, 0.1);
+    width: 360px;
+    height: 397px;
+    padding: 20px;
+    padding-top: 64px;
+    position: relative;
+
+    .title {
+      position: absolute;
+      top: 20px;
+      font-size: 18px;
+      color: #212121;
+    }
+
+    .content {
+      .content-son {
+        .content-left {
+          margin-bottom: 8px;
+          height: 56px;
+          width: 320px;
+          background: #f1f4fb;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          border-radius: 1px;
+
+          .name {
             display: flex;
-            justify-content: space-between;
+            justify-content: center;
             align-items: center;
-            border-radius: 1px;
-            .name {
-              display: flex;
-              justify-content: center;
-              align-items: center;
-              .name-photo {
-                margin-left: 10px;
-                display: inline-block;
-                height: 32px;
-                width: 32px;
-                margin-right: 11px;
-              }
-            }
-            .organization-value {
-              margin-right: 16px;
-              .num {
-                font-size: 26px;
-              }
-              span:nth-child(2) {
-                font-size: 16px;
-              }
+
+            .name-photo {
+              margin-left: 10px;
+              display: inline-block;
+              height: 32px;
+              width: 32px;
+              margin-right: 11px;
             }
           }
-        }
-      }
-    }
-    .resource-aggregation-right {
-      background: #fff;
-      border: 1px solid #e6e9ed;
-      border-radius: 2px;
-      box-shadow: 0 4px 20px rgba(233, 233, 233, 0.1);
-      margin-left: 20px;
-      width: 920px;
-      height: 397px;
-      padding: 64px;
-      overflow: hidden;
-      position: relative;
-      display: flex;
-      padding-left: 120px;
-      .title {
-        position: absolute;
-        top: 20px;
-        left: 20px;
-        font-size: 18px;
-        color: #212121;
-      }
-      .bumensnum {
-        width: 100px;
-        position: absolute;
-        left: 20px;
-        height: 313px;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        padding-top: 66px;
-        background: rgba(0, 88, 225, 0.1);
-        border-right: 1px solid rgba(0, 88, 225, 0.5);
-        border-radius: 2px;
-        .bumensnum-photo {
-          height: 50px;
-          width: 50px;
-          background: url('~@/assets/abilityStatistics/bumenzongshu.png')
-            no-repeat;
-          margin-bottom: 30px;
-        }
-        p {
-          margin-top: 18px;
-          color: #0058e1;
-          .num {
-            font-size: 30px;
+
+          .organization-value {
+            margin-right: 16px;
+
+            .num {
+              font-size: 26px;
+            }
+
+            span:nth-child(2) {
+              font-size: 16px;
+            }
           }
-          span:last-child {
-            font-size: 16px;
-          }
-        }
-      }
-      .content {
-        width: 779px;
-        height: 313px;
-        display: flex;
-        position: relative;
-        background: #f1f4fb;
-        .left {
-          width: 373px;
-          height: 313px;
-        }
-        .center {
-          height: 240px;
-          width: 1px;
-          margin-top: 31px;
-          background: #d0d4de;
-        }
-        .right {
-          width: 406px;
-          height: 313px;
-        }
-        .right-son1 {
-          position: absolute;
-          top: 10px;
-          left: 52.5%;
-        }
-        .right-son2 {
-          position: absolute;
-          top: 10px;
-          left: 70.5%;
         }
       }
     }
   }
+
+  .resource-aggregation-right {
+    background: #fff;
+    border: 1px solid #e6e9ed;
+    border-radius: 2px;
+    box-shadow: 0 4px 20px rgba(233, 233, 233, 0.1);
+    margin-left: 20px;
+    width: 920px;
+    height: 397px;
+    padding: 64px;
+    overflow: hidden;
+    position: relative;
+    display: flex;
+    padding-left: 120px;
+
+    .title {
+      position: absolute;
+      top: 20px;
+      left: 20px;
+      font-size: 18px;
+      color: #212121;
+    }
+
+    .bumensnum {
+      width: 100px;
+      position: absolute;
+      left: 20px;
+      height: 313px;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      padding-top: 66px;
+      background: rgba(0, 88, 225, 0.1);
+      border-right: 1px solid rgba(0, 88, 225, 0.5);
+      border-radius: 2px;
+
+      .bumensnum-photo {
+        height: 50px;
+        width: 50px;
+        background: url('~@/assets/abilityStatistics/bumenzongshu.png') no-repeat;
+        margin-bottom: 30px;
+      }
+
+      p {
+        margin-top: 18px;
+        color: #0058e1;
+
+        .num {
+          font-size: 30px;
+        }
+
+        span:last-child {
+          font-size: 16px;
+        }
+      }
+    }
+
+    .content {
+      width: 779px;
+      height: 313px;
+      display: flex;
+      position: relative;
+      background: #f1f4fb;
+
+      .left {
+        width: 373px;
+        height: 313px;
+      }
+
+      .center {
+        height: 240px;
+        width: 1px;
+        margin-top: 31px;
+        background: #d0d4de;
+      }
+
+      .right {
+        width: 406px;
+        height: 313px;
+      }
+
+      .right-son1 {
+        position: absolute;
+        top: 10px;
+        left: 52.5%;
+      }
+
+      .right-son2 {
+        position: absolute;
+        top: 10px;
+        left: 70.5%;
+      }
+    }
+  }
+}
 </style>

From ad34e10710e9b68e8d6181c50fef1e70840646a2 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Mon, 3 Oct 2022 16:23:30 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E5=B8=82=E5=B1=80=EF=BC=9A=E8=83=BD?=
 =?UTF-8?q?=E5=8A=9B=E7=94=B3=E8=AF=B7--=E6=8A=80=E6=9C=AF=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E7=94=B1=E5=AF=8C=E6=96=87=E6=9C=AC=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../capacityOnTheShelf/components/PutOnTheShelf.vue   | 11 +++++++++++
 front/src/views/components/upload/index.vue           |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
index 5e567ebe..ea8da729 100644
--- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
+++ b/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="附件"
diff --git a/front/src/views/components/upload/index.vue b/front/src/views/components/upload/index.vue
index 8150011d..27b20cfe 100644
--- a/front/src/views/components/upload/index.vue
+++ b/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;

From cdb0ed10ea06810ef379116327237ece93fbdb1b Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Mon, 3 Oct 2022 16:25:20 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=EF=BC=8C=E5=B7=B2=E5=8A=9E=E8=B7=B3=E8=BD=AC=EF=BC=8C?=
 =?UTF-8?q?=E5=88=86=E5=88=AB=E8=B7=B3=E8=BD=AC=E5=88=B0=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=E3=80=81=E5=B7=B2=E5=8A=9E-=E8=83=BD=E5=8A=9B=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/workBench/workBench.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/back/src/views/modules/workBench/workBench.vue b/back/src/views/modules/workBench/workBench.vue
index de1c70b3..d01b97c6 100644
--- a/back/src/views/modules/workBench/workBench.vue
+++ b/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: [],

From c1c4eaf4d6c2a60ec69ce0832055c9200fd063d1 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Mon, 3 Oct 2022 16:26:16 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E5=B8=82=E5=B1=80=EF=BC=9A=E8=83=BD?=
 =?UTF-8?q?=E5=8A=9B=E7=BB=9F=E8=AE=A1--=E8=A6=86=E7=9B=96=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E9=87=8F=E6=94=B9=E4=B8=BA=E8=B5=84=E6=BA=90=E6=B1=87?=
 =?UTF-8?q?=E8=81=9A=E9=83=A8=E9=97=A8=E9=87=8F=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/abilityStatistics/components/AbilityTotal.vue    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/front/src/views/abilityStatistics/components/AbilityTotal.vue b/front/src/views/abilityStatistics/components/AbilityTotal.vue
index 14031084..2632bb9d 100644
--- a/front/src/views/abilityStatistics/components/AbilityTotal.vue
+++ b/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
         }

From 251c3d33d617b5caf1cdc45215738b02b6a51c06 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Mon, 3 Oct 2022 17:23:12 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E5=B8=82=E5=B1=80=EF=BC=9A=E5=9F=8E?=
 =?UTF-8?q?=E5=B8=82=E4=BA=91=E8=84=91=E4=BC=9A=E5=AE=A2=E5=8E=85--?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=94=B5=E8=AF=9D=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/infrastructurePage.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index caa2cf86..54067c5a 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -330,11 +330,11 @@
                 <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"
                 label="联系电话"
-                v-bind="validateInfos.phone"
               >
                 <a-input v-model:value="formState.phone" style="width: 72%" />
               </a-form-item>
@@ -852,13 +852,13 @@
       },
     ],
     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: '请输入正确的手机号',
-      },
-    ],
+    // phone: [
+    //   {
+    //     required: true,
+    //     pattern: /^1[3|4|5|7|8|9][0-9]\d{8}$/,
+    //     message: '请输入正确的手机号',
+    //   },
+    // ],
     dept: [
       {
         required: true,