合并版本v0.8.2.6

Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev
需求申请报错修改
2022-07-21 18:17:37 +08:00 · 2022-07-21 18:02:43 +08:00 · 2022-07-21 18:00:49 +08:00 · 2022-07-21 17:58:13 +08:00 · 2022-07-21 17:20:43 +08:00 · 2022-07-21 17:13:55 +08:00
35 changed files with 2180 additions and 402 deletions
--- a/back/public/index.html
+++ b/back/public/index.html
@ -2,7 +2,7 @@
 * @Author: hisense.wuhongjian
 * @Date: 2022-04-11 10:11:40
 * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-15 18:41:00
+ * @LastEditTime: 2022-07-21 15:03:51
 * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@ -44,8 +44,8 @@
      // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.166:8888/renren-admin';
    // window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin';
    // window.SITE_CONFIG['apiURL'] = 'http://10.16.5.35:8888/renren-admin';
-    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
-    window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
+    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin';
+    window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.236:9796/';
    // window.SITE_CONFIG['apiURL'] = 'http://15.2.23.141:8000/renren-admin';
    // WebSocket地址
    window.SITE_CONFIG['socketURL'] ='ws://localhost:8080/renren-admin/websocket';
--- a/back/src/assets/img/Capabilitydiagram.png
+++ b/back/src/assets/img/Capabilitydiagram.png
--- a/back/src/mixins/view-module.js
+++ b/back/src/mixins/view-module.js
@ -109,11 +109,11 @@ export default {
        }

        console.log('数据列表', this.dataList, this.mixinViewModuleOptions.getDataListURL)
-        if (this.dataList[0].type === '组件服务') {
-          this.dataList.map(val => {
-            val.infoList = val.infoList.filter(item => item.attrType === '部署位置' || item.attrType === '组件类型' || item.attrType === '应用领域')
-          })
-        }
+        // if (this.dataList[0].type === '组件服务') {
+        //   this.dataList.map(val => {
+        //     val.infoList = val.infoList.filter(item => item.attrType === '部署位置' || item.attrType === '组件类型' || item.attrType === '应用领域')
+        //   })
+        // }
        if (this.mixinViewModuleOptions.requestCallback) {
          this.mixinViewModuleOptions.requestCallback(res.data)
        }
--- a/back/src/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@ -299,19 +299,19 @@ export default {
          this.dataList = this.mixinViewModuleOptions.getDataListIsPage
            ? res.data.list
            : res.data
-          this.dataList.map((item, index) => {
-            const dataListSinforList = []
-            item.infoList.map((itemson, indexson) => {
-              if (
-                itemson.attrType === '部署位置' ||
-                itemson.attrType === '组件类型' ||
-                itemson.attrType === '应用领域'
-              ) {
-                dataListSinforList.push(itemson)
-              }
-            })
-            this.dataList[index].infoList = dataListSinforList
-          })
+          // this.dataList.map((item, index) => {
+          //   const dataListSinforList = []
+          //   item.infoList.map((itemson, indexson) => {
+          //     if (
+          //       itemson.attrType === '部署位置' ||
+          //       itemson.attrType === '组件类型' ||
+          //       itemson.attrType === '应用领域'
+          //     ) {
+          //       dataListSinforList.push(itemson)
+          //     }
+          //   })
+          //   this.dataList[index].infoList = dataListSinforList
+          // })
          console.log('this.dataList', this.dataList)
          this.total = this.mixinViewModuleOptions.getDataListIsPage
            ? res.data.total
@ -386,19 +386,19 @@ export default {
                this.mixinViewModuleOptions.requestCallback(res.data)
              }
              this.dataListLoading = false
-              this.dataList.map((item, index) => {
-                const dataListSinforList = []
-                item.infoList.map((itemson, indexson) => {
-                  if (
-                    itemson.attrType === '部署位置' ||
-                    itemson.attrType === '组件类型' ||
-                    itemson.attrType === '应用领域'
-                  ) {
-                    dataListSinforList.push(itemson)
-                  }
-                })
-                this.dataList[index].infoList = dataListSinforList
-              })
+              // this.dataList.map((item, index) => {
+              //   const dataListSinforList = []
+              //   item.infoList.map((itemson, indexson) => {
+              //     if (
+              //       itemson.attrType === '部署位置' ||
+              //       itemson.attrType === '组件类型' ||
+              //       itemson.attrType === '应用领域'
+              //     ) {
+              //       dataListSinforList.push(itemson)
+              //     }
+              //   })
+              //   this.dataList[index].infoList = dataListSinforList
+              // })
            } else {
              this.$message.error('未查询到相关信息')
              this.reset()
--- a/back/src/views/modules/activiti/demo/putaway-process3.vue
+++ b/back/src/views/modules/activiti/demo/putaway-process3.vue
@ -0,0 +1,529 @@
+<!-- 能力下架审批 -->
+<template>
+  <div class="Ability-to-take-off-the-shelf-approval">
+    <div class="Ability-to-take-off-the-shelf-approval-title">能力下架审批</div>
+    <div class="basic-information">
+      <div class="basic-information-title">
+        <span></span><span>基本信息</span>
+      </div>
+      <div class="basic-information-content">
+        <p>
+          <span class="text">
+            能力申请标题：<span> {{ dataForm.name || '--' }}</span></span
+          >
+          <span class="text"
+            >下架单号：<span>{{ dataForm.applyNumber || '--' }}</span></span
+          >
+        </p>
+        <p>
+          <span class="text"
+            >申请人：<span>
+              {{ dataForm.undercarriageUserName || '--' }}</span
+            ></span
+          >
+          <span class="text"
+            >电话：<span>{{ dataForm.deptPhone || '--' }}</span></span
+          >
+          <span class="text"
+            >单位：<span>{{ dataForm.deptName || deptName }}</span></span
+          >
+        </p>
+        <p v-if="dataForm.enclosure" class="accessory">
+          <span>
+            申请附件：<span>
+              {{ dataForm.enclosure || '--'
+              }}<button @click="downloadFile2(dataForm.enclosure)">
+                预览
+              </button></span
+            ></span
+          >
+        </p>
+      </div>
+    </div>
+    <div class="Ability-to-apply-for">
+      <div class="Ability-to-apply-for-title">
+        <span></span><span>申请能力</span>
+      </div>
+      <div class="Ability-to-apply-for-content">
+        <div class="data-list">
+          <div class="data-list-left"></div>
+          <div class="data-list-right">
+            <div class="data-list-right-titleAndDescription">
+              <div class="data-list-right-title">
+                <div class="title-left">
+                  <span>{{ dataForm.name }}</span>
+                  <span>{{ dataForm.type }}</span>
+                </div>
+                <div class="title-right">
+                  <span>能力使用状态：</span>
+                  <span v-if="dataList.total > 0">正在被使用</span>
+                  <span v-else>未使用</span>
+                </div>
+              </div>
+              <div class="data-list-right-description">
+                {{ dataForm.name }}：{{ dataForm.description }}
+              </div>
+            </div>
+            <div class="data-list-right-table">
+              <div class="data-list-right-table-title">
+                正在使用应用数：{{ dataList.total }}
+              </div>
+              <div class="data-list-right-table-list">
+                <div class="data-list-right-table-list-tab">
+                  <span
+                    v-for="(item, index) in datalistrighttablelist"
+                    :key="`data-list-right-table-list-tab-${index}`"
+                  >
+                    {{ item }}
+                  </span>
+                </div>
+                <div
+                  class="data-list-right-table-list-content"
+                  v-if="dataList.total > 0"
+                >
+                  <div
+                    v-for="(item, index) in dataList.list"
+                    :key="`data-list-right-table-list-content-${index}`"
+                  >
+                    <span>{{ item.applicationSystem }}</span>
+                    <span>{{ item.unit }}</span>
+                    <span>{{ item.user }}</span>
+                    <span>{{ item.phone }}</span>
+                  </div>
+                </div>
+                <div v-else class="zanwu">暂无数据</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="agreeOr">
+      <div>
+        <!-- <el-radio-group v-model="agreeOrList" style="width:230px;">
+          <el-radio-button label="同意" class="blueAll" @click="showDialog('同意')">同意</el-radio-button>
+          <el-radio-button label="退回" class="redAll" @click="showDialog('退回')">退回</el-radio-button>
+        </el-radio-group> -->
+        <el-button type="primary" @click="showDialog('同意')">同意</el-button>
+        <el-button type="danger" plain @click="showDialog('拒绝')"
+          >拒绝</el-button
+        >
+        <!-- <el-input v-if="agreeOrList ==='同意' " v-model="inputAgree" placeholder="请输入同意意见"></el-input>
+        <el-input v-if="agreeOrList ==='退回'" v-model="inputNo" placeholder="请输入退回意见"></el-input>
+         <el-button class="inputBule" @click="agreeOrNot">提交</el-button> -->
+      </div>
+    </div>
+    <!--  流程详情   -->
+    <ren-process-detail></ren-process-detail>
+    <el-dialog
+      title="审批意见"
+      :visible.sync="dialogVisible"
+      width="30%"
+      :before-close="handleClose"
+    >
+      <el-input v-model="input" placeholder="请输入审批意见"></el-input>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="handleClose2">取 消</el-button>
+        <el-button
+          type="primary"
+          @click.native="agreeOrNot($store.state.contentTabsActiveName)"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+// 引入工作流公共方法
+import processModule from '@/mixins/process-module'
+import RenProcessDetail from '@/components/ren-process-detail/src/ren-process-detail'
+import debounce from 'lodash/debounce'
+import qs from 'qs'
+export default {
+  components: { RenProcessDetail },
+  props: {},
+  mixins: [processModule],
+  data () {
+    return {
+      dialogVisible: false,
+      dialogType: '',
+      input: '',
+      visible: true,
+      showKey: 0,
+      dataForm: [],
+      deptName: '',
+      dataList: {},
+      datalistrighttablelist: [
+        '赋能应用名称',
+        '应用归属部门',
+        '部门联系人',
+        '联系人电话'
+      ]
+    }
+  },
+  watch: {},
+  computed: {},
+  methods: {
+    init () {
+      this.getInfo(this.$router.currentRoute.params.businessKey)
+    },
+    getInfo (id) {
+      this.$http.get('/resource/' + id).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        console.log('this.dataForm', res.data)
+        this.dataForm = res.data
+        this.deptIdQuery()
+        this.AbilityToPullDownPages()
+      })
+    },
+    deptIdQuery () {
+      this.$http
+        .get(`/sys/dept/${this.dataForm.deptId}`)
+        .then(({ data: res }) => {
+          this.deptName = res.data.name
+          console.log('dataFrom', this.deptName)
+        })
+    },
+    AbilityToPullDownPages () {
+      this.$http
+        .get(
+          '/processForm/tabilityapplication/in_use_page?resourceId=' +
+            this.dataForm.id
+        )
+        .then((res) => {
+          this.dataList = res.data.data
+        })
+    },
+    showDialog (title) {
+      this.dialogVisible = true
+      this.dialogType = title
+    },
+    downloadFile2 (url) {
+      console.log(window.SITE_CONFIG.previewUrl)
+      window.open(
+        window.SITE_CONFIG.previewUrl +
+          'hisense_office/onlinePreview?url=' +
+          btoa(encodeURI(url))
+      )
+    },
+    handleClose (done) {
+      this.$confirm('确认关闭？')
+        .then((_) => {
+          this.input = ''
+          done()
+        })
+        .catch((_) => {})
+    },
+    handleClose2 () {
+      this.dialogVisible = false
+      this.input = ''
+    },
+    // 同意与退回
+    agreeOrNot: debounce(
+      function (data) {
+        this.dataForm.taskId = this.$route.params.taskId
+        if (this.dialogType === '同意') {
+          console.log('this.dataForm', this.dataForm)
+          const params = qs.stringify({
+            taskId: this.dataForm.taskId,
+            comment: this.input
+          })
+          console.log(params)
+          this.$http
+            .post('/act/task/complete?' + params)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                this.$message.error(res.msg)
+                if (this.callbacks.taskHandleErrorCallback) {
+                  this.callbacks.taskHandleErrorCallback(res)
+                }
+                return
+              }
+              this.$message({
+                message: this.$t('prompt.success'),
+                type: 'success',
+                duration: 500,
+                onClose: () => {
+                  this.visible = false
+                  this.dialogVisible = false
+                  if (this.callbacks.taskHandleSuccessCallback) {
+                    this.callbacks.taskHandleSuccessCallback(res)
+                  }
+                }
+              })
+            })
+            .catch(() => {})
+        } else if (this.dialogType === '拒绝') {
+          const params = qs.stringify({
+            taskId: this.dataForm.taskId,
+            comment: this.input
+          })
+          this.$http
+            .post('/act/task/backToFirst?', params)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                this.$message.error(res.msg)
+                if (this.callbacks.taskHandleErrorCallback) {
+                  this.callbacks.taskHandleErrorCallback(res)
+                }
+                return
+              }
+              this.$message({
+                message: this.$t('prompt.success'),
+                type: 'success',
+                duration: 500,
+                onClose: () => {
+                  this.visible = false
+                  if (this.callbacks.taskHandleSuccessCallback) {
+                    this.callbacks.taskHandleSuccessCallback(res)
+                  }
+                }
+              })
+            })
+        }
+        this.tabRemoveHandle(data)
+        // this.getDataList(data)
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
+    tabRemoveHandle (tabName) {
+      console.log(tabName, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+      if (tabName === 'home') {
+        return false
+      }
+      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
+        (item) => item.name !== tabName
+      )
+      if (this.$store.state.contentTabs.length <= 0) {
+        this.$store.state.sidebarMenuActiveName =
+          this.$store.state.contentTabsActiveName = 'home'
+        return false
+      }
+      // 当前选中tab被删除
+      if (tabName === this.$store.state.contentTabsActiveName) {
+        const tab =
+          this.$store.state.contentTabs[
+            this.$store.state.contentTabs.length - 1
+          ]
+        this.$router.push({
+          name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name,
+          params: { ...tab.params },
+          query: { ...tab.query }
+        })
+      }
+    },
+    // 启动流程出错回调
+    startProcessErrorCallback (data) {
+      console.log(data)
+    },
+    // 任务处理出错回调
+    taskHandleErrorCallback (data) {}
+  },
+  created () {
+    this.init()
+  },
+  mounted () {}
+}
+</script>
+<style lang="scss" scoped>
+.Ability-to-take-off-the-shelf-approval {
+  background: #fff;
+  padding: 20px;
+  .Ability-to-take-off-the-shelf-approval-title {
+    font-weight: 600;
+    margin-bottom: 20px;
+    font-size: 18px;
+  }
+  .basic-information {
+    margin-left: 40px;
+    margin-bottom: 40px;
+    .basic-information-title {
+      display: flex;
+      align-items: center;
+      font-size: 16px;
+      margin-bottom: 10px;
+      span:first-child {
+        display: inline-block;
+        height: 20px;
+        width: 5px;
+        background: #0087ff;
+        margin-right: 5px;
+      }
+    }
+    .basic-information-content {
+      background: rgba(244, 245, 248, 0.8);
+      padding: 24px;
+      margin-left: 10px;
+      p {
+        width: 100%;
+        display: grid;
+        grid-template-columns: repeat(3, 33%);
+        color: #212121;
+        font-size: 14px;
+        span {
+          display: inline-block;
+          margin-left: 8px;
+          line-height: 32px;
+          span {
+            font-weight: bold;
+          }
+        }
+        .text {
+          width: 500px;
+        }
+      }
+      .accessory {
+        margin-top: 16px;
+        width: 100%;
+        span {
+          display: flex;
+          span {
+            padding: 0 12px;
+            height: 32px;
+            background: rgba(232, 234, 239, 1);
+            border-radius: 2px;
+            button {
+              background: unset;
+              border: 0;
+              color: #0558e1;
+              font-size: 14px;
+            }
+          }
+        }
+      }
+    }
+  }
+  .Ability-to-apply-for {
+    margin-left: 40px;
+    .Ability-to-apply-for-title {
+      display: flex;
+      align-items: center;
+      font-size: 16px;
+      margin-bottom: 10px;
+      border-bottom: 1px #dddee1 solid;
+      padding-bottom: 10px;
+      span:first-child {
+        display: inline-block;
+        height: 20px;
+        width: 5px;
+        background: #0087ff;
+        margin-right: 5px;
+      }
+    }
+    .Ability-to-apply-for-content {
+      .data-list {
+        display: flex;
+        border-bottom: 1px solid #dddee1;
+        margin-bottom: 10px;
+        .data-list-left {
+          width: 80px;
+          height: 110px;
+          background: url('~@/assets/img/Capabilitydiagram.png') no-repeat;
+          background-size: 80px 80px;
+          background-position: center;
+          margin-left: 10px;
+          padding-bottom: 30px;
+        }
+        .data-list-right {
+          width: calc(100% - 83px);
+          margin-left: 10px;
+          padding-bottom: 20px;
+          border-left: 1px solid #dddee1;
+          font-size: 18px;
+          color: #000000;
+          .data-list-right-titleAndDescription {
+            padding-left: 10px;
+            padding-right: 20px;
+            border-bottom: 1px solid #dddee1;
+            padding-bottom: 10px;
+            .data-list-right-title {
+              display: flex;
+              justify-content: space-between;
+              margin-bottom: 0.2rem;
+              .title-left {
+                span:first-child {
+                  font-weight: 600;
+                }
+                span:last-child {
+                  font-size: 14px;
+                  display: inline-block;
+                  margin-left: 8px;
+                  padding: 0 5px;
+                  border-radius: 30px;
+                  background: #00b8e6;
+                  color: #fff;
+                }
+              }
+            }
+          }
+          .data-list-right-description {
+            margin: 10px 0;
+            font-size: 16px;
+          }
+          .data-list-right-table {
+            .data-list-right-table-title {
+              margin-left: 10px;
+              margin-top: 20px;
+              margin-bottom: 20px;
+              font-size: 14px;
+              display: inline-block;
+              margin-left: 8px;
+              padding: 0 5px;
+              border-radius: 30px;
+              background: #00b8e6;
+              color: #fff;
+            }
+            .data-list-right-table-list {
+              padding: 0 5px;
+              .data-list-right-table-list-tab {
+                display: grid;
+                grid-template-columns: repeat(4, 25%);
+                background: rgba(191, 191, 191, 0.1);
+                span {
+                  display: inline-block;
+                  text-align: center;
+                  padding: 5px 0;
+                }
+              }
+              .data-list-right-table-list-content {
+                & > div {
+                  display: grid;
+                  grid-template-columns: repeat(4, 25%);
+                  span {
+                    display: inline-block;
+                    text-align: center;
+                    padding: 5px 0;
+                  }
+                }
+                div:nth-child(even) {
+                  background: rgba(191, 191, 191, 0.1);
+                }
+                div:nth-child(odd) {
+                  span {
+                    padding: 20px 0;
+                  }
+                }
+              }
+              .zanwu {
+                margin-top: 20px;
+                text-align: center;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  .agreeOr {
+    & > div {
+      text-align: right;
+      padding-right: 40px;
+      margin: 20px 0;
+    }
+  }
+}
+</style>
--- a/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
+++ b/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
@ -176,29 +176,30 @@ export default {
                itemViewSon.children.map((itemSon, indexSon) => {
                  // console.log('itemSon', itemSon)
                  if (itemSon.name.indexOf('描述') != -1) {
-                    this.dataView.children[indexView].children[0].children[
+                    this.dataView.children[indexView].children[indexViewSon].children[
                      indexSon
                    ].note1 = this.dataForm.description
                  } else if (itemSon.name.indexOf('名称') != -1) {
-                    this.dataView.children[indexView].children[0].children[
+                    this.dataView.children[indexView].children[indexViewSon].children[
                      indexSon
                    ].note1 = this.dataForm.name
                  } else if (itemSon.name.indexOf('能力类型') != -1) {
-                    this.dataView.children[indexView].children[0].children[
+                    this.dataView.children[indexView].children[indexViewSon].children[
                      indexSon
                    ].note1 = this.dataForm.type
+                  } else if (itemSon.name === '部门联系人') {
+                    console.log('itemSon.name', itemSon.name)
+                    this.dataView.children[indexView].children[indexViewSon].children[
+                      indexSon
+                    ].note1 = this.dataForm.deptContacts
                  } else if (itemSon.name.indexOf('属部门') != -1) {
-                    this.dataView.children[indexView].children[0].children[
+                    this.dataView.children[indexView].children[indexViewSon].children[
                      indexSon
                    ].note1 = this.unit
-                  } else if (itemSon.name.indexOf('共享条件') != -1) {
-                    this.dataView.children[indexView].children[
-                      indexViewSon
-                    ].children[indexSon].note1 = this.dataForm.shareCondition
-                  } else if (itemSon.name.indexOf('共享类型') != -1) {
-                    this.dataView.children[indexView].children[
-                      indexViewSon
-                    ].children[indexSon].note1 = this.dataForm.shareType
+                  } else if (itemSon.name === '部门联系人电话') {
+                    this.dataView.children[indexView].children[indexViewSon].children[
+                      indexSon
+                    ].note1 = this.dataForm.deptPhone
                  } else if (
                    itemSon.name === '关联组件信息' &&
                    item.attrType === '关联组件信息'
@ -247,39 +248,40 @@ export default {
                itemViewSon.children.map((itemSon, indexSon) => {
                  console.log('itemSon', itemSon)
                  if (itemSon.name.indexOf('描述') != -1) {
-                    this.dataView.children[indexView].children[0].children[
+                    this.dataView.children[indexView].children[indexViewSon].children[
                      indexSon
                    ].note1 = this.dataForm.description
                  } else if (itemSon.name.indexOf('名称') != -1) {
-                    this.dataView.children[indexView].children[0].children[
+                    this.dataView.children[indexView].children[indexViewSon].children[
                      indexSon
                    ].note1 = this.dataForm.name
                  } else if (itemSon.name.indexOf('共享条件') != -1) {
-                    this.dataView.children[indexView].children[0].children[
+                    this.dataView.children[indexView].children[indexViewSon].children[
                      indexSon
                    ].note1 = this.dataForm.shareCondition
                  } else if (itemSon.name.indexOf('共享方式') != -1) {
-                    this.dataView.children[indexView].children[0].children[
+                    this.dataView.children[indexView].children[indexViewSon].children[
                      indexSon
                    ].note1 = this.dataForm.shareMode
                  } else if (itemSon.name.indexOf('共享类型') != -1) {
-                    this.dataView.children[indexView].children[0].children[
+                    this.dataView.children[indexView].children[indexViewSon].children[
                      indexSon
                    ].note1 = this.dataForm.shareType
-                  } else if (itemSon.name.indexOf('部门联系人') != -1) {
-                    this.dataView.children[indexView].children[0].children[
+                  } else if (itemSon.name === '部门联系人') {
+                    console.log('itemSon.name', itemSon.name)
+                    this.dataView.children[indexView].children[indexViewSon].children[
                      indexSon
                    ].note1 = this.dataForm.deptContacts
                  } else if (itemSon.name.indexOf('属部门') != -1) {
-                    this.dataView.children[indexView].children[0].children[
+                    this.dataView.children[indexView].children[indexViewSon].children[
                      indexSon
                    ].note1 = this.unit
-                  } else if (itemSon.name.indexOf('部门联系人电话') != -1) {
-                    this.dataView.children[indexView].children[0].children[
+                  } else if (itemSon.name === '部门联系人电话') {
+                    this.dataView.children[indexView].children[indexViewSon].children[
                      indexSon
                    ].note1 = this.dataForm.deptPhone
                  } else if (itemSon.name.indexOf('接口请求方式') != -1) {
-                    this.dataView.children[indexView].children[0].children[
+                    this.dataView.children[indexView].children[indexViewSon].children[
                      indexSon
                    ].note1 = this.dataForm.apiMethodType
                  } else if (
@ -403,7 +405,7 @@ export default {
    color: #333333;
    font-size: 22px;
    margin-bottom: 20px;
-    background: url('~@/assets/img/sj-jx.png') no-repeat;
+    background: url("~@/assets/img/sj-jx.png") no-repeat;
    background-position-x: 15px;
  }
  .multipleAdditionsClass {
@ -417,6 +419,7 @@ export default {
      flex-direction: column;
      align-items: center;
      padding: 10px;
+      overflow: hidden;
      & > div:first-child {
        margin-bottom: 10px;
        font-weight: bold;
@ -445,6 +448,14 @@ export default {
      align-items: center;
      padding: 10px;
      position: relative;
+      & > div {
+        -webkit-line-clamp: 5;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        word-break: break-all;
+      }
      & > div:first-child {
        margin-bottom: 10px;
        font-weight: bold;
--- a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
+++ b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
@ -36,7 +36,11 @@
    <div class="agreeOr">
      <h3>审批</h3>
      <div>
-        <el-radio-group v-model="agreeOrList" style="width: 230px">
+        <el-button type="primary" @click="showDialog('同意')">同意</el-button>
+        <el-button type="danger" plain @click="showDialog('拒绝')"
+          >拒绝</el-button
+        >
+        <!-- <el-radio-group v-model="agreeOrList" style="width: 230px">
          <el-radio-button label="同意" class="blueAll">同意</el-radio-button>
          <el-radio-button label="退回" class="redAll">退回</el-radio-button>
        </el-radio-group>
@ -54,9 +58,27 @@
          class="inputBule"
          @click.native="agreeOrNot($store.state.contentTabsActiveName)"
          >提交</el-button
+        > -->
+      </div>
+    </div>
+    <!--  流程详情   -->
+    <ren-process-detail></ren-process-detail>
+    <el-dialog
+      title="审批意见"
+      :visible.sync="dialogVisible"
+      width="30%"
+      :before-close="handleClose"
    >
-      </div>
-    </div>
+      <el-input v-model="input" placeholder="请输入审批意见"></el-input>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="handleClose2">取 消</el-button>
+        <el-button
+          type="primary"
+          @click.native="agreeOrNot($store.state.contentTabsActiveName)"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
  </div>
 </template>

@ -81,6 +103,9 @@ export default {
  },
  data () {
    return {
+      dialogVisible: false,
+      dialogType: '',
+      input: '',
      flagShow: false,
      // processVisible: true,
      visible: false,
@ -135,6 +160,22 @@ export default {
        }
      })
    },
+    showDialog (title) {
+      this.dialogVisible = true
+      this.dialogType = title
+    },
+    handleClose (done) {
+      this.$confirm('确认关闭？')
+        .then((_) => {
+          this.input = ''
+          done()
+        })
+        .catch((_) => {})
+    },
+    handleClose2 () {
+      this.dialogVisible = false
+      this.input = ''
+    },
    methodsThree () {
      this.$http.get('/category/getCategoryTree').then((res) => {
        this.insertList = res.data.data
@ -152,14 +193,14 @@ export default {
        // }
      })
    },
+    // 同意与退回
    agreeOrNot: debounce(
      function (data) {
-        console.log(data)
-        if (this.agreeOrList === '同意') {
-          console.log('this.dataForm.taskId', this.taskId)
+        if (this.dialogType === '同意') {
+          console.log('this.dataForm', this.dataForm)
          const params = qs.stringify({
            taskId: this.taskId,
-            comment: this.inputAgree
+            comment: this.input
          })
          console.log(params)
          this.$http
@ -178,6 +219,8 @@ export default {
                duration: 500,
                onClose: () => {
                  this.visible = false
+                  this.dialogVisible = false
+                  this.input = ''
                  if (this.callbacks.taskHandleSuccessCallback) {
                    this.callbacks.taskHandleSuccessCallback(res)
                  }
@ -185,14 +228,13 @@ export default {
              })
            })
            .catch(() => {})
-        } else if (this.agreeOrList === '退回') {
-          console.log('this.dataForm.taskId', this.taskId)
+        } else if (this.dialogType === '拒绝') {
          const params = qs.stringify({
-            taskId: this.taskId,
-            comment: this.inputNo
+            taskId: this.dataForm.taskId,
+            comment: this.input
          })
          this.$http
-            .post('/act/task/backToFirst?', params)
+            .post('/act/task/endProcess?', params)
            .then(({ data: res }) => {
              if (res.code !== 0) {
                this.$message.error(res.msg)
--- a/back/src/views/modules/myAgent/demo/competency-application.vue
+++ b/back/src/views/modules/myAgent/demo/competency-application.vue
@ -2,32 +2,60 @@
 * @Author: hisense.liangjunhua
 * @Date: 2022-06-29 15:59:51
 * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-04 16:17:22
+ * @LastEditTime: 2022-07-21 16:41:09
 * @Description: 告诉大家这是什么
 -->
 <!--  流程业务表单   -->
 <template>
-  <el-card shadow="never" class="aui-card--fill" :key='showKey'>
+  <el-card shadow="never" class="aui-card--fill" :key="showKey">
    <!-- 申请人详情 -->
    <div>
      <h3>申请人信息</h3>
      <div class="big-BOX">
        <p>
-        <span class="text">申请人：<span> {{dataForm.content.user || '--'}}</span></span>
-        <span class="text">电话：<span>{{dataForm.content.phone || '--'}}</span></span>
-        <span class="text">单位：<span>{{dataForm.content.unit || '--'}}</span></span>
+          <span class="text"
+            >申请人：<span> {{ dataForm.content.user || '--' }}</span></span
+          >
+          <span class="text"
+            >电话：<span>{{ dataForm.content.phone || '--' }}</span></span
+          >
+          <span class="text"
+            >单位：<span>{{ dataForm.content.unit || '--' }}</span></span
+          >
        </p>
        <p>
-        <span class="text"> 能力申请标题：<span> {{dataForm.content.title|| '--'}}</span></span>
-        <span class="text">应用系统：<span>{{dataForm.content.applicationSystem || '--'}}</span></span>
-        <span class="text">应用场景：<span> {{dataForm.content.applicationSceneStr || '--'}}</span></span>
+          <span class="text">
+            能力申请标题：<span>
+              {{ dataForm.content.title || '--' }}</span
+            ></span
+          >
+          <span class="text"
+            >应用系统：<span>{{
+              dataForm.content.applicationSystem || '--'
+            }}</span></span
+          >
+          <span class="text"
+            >应用场景：<span>
+              {{ dataForm.content.applicationSceneStr || '--' }}</span
+            ></span
+          >
        </p>
        <p>
-        <span> 能力应用期望效果：<span> {{dataForm.content.effectWish|| '--'}}</span></span>
+          <span>
+            能力应用期望效果：<span>
+              {{ dataForm.content.effectWish || '--' }}</span
+            ></span
+          >
        </p>
        <p v-if="dataForm.content.enclosure">
-      <span> 申请附件：<span> {{dataForm.content.enclosure|| '--'}}<button  @click="downloadFile2(dataForm.content.enclosure)">预览</button></span></span>
-
+          <span>
+            申请附件：<span>
+              {{ dataForm.content.enclosure || '--'
+              }}<button @click="downloadFile2(dataForm.content.enclosure)">
+                预览
+              </button></span
+            ></span
+          >
        </p>
      </div>
    </div>
@ -38,11 +66,11 @@
      <ul v-for="item in dataList" :key="item.id">
        <!-- <li class="title">{{item.address}}</li> -->
        <li class="clearfix">
-            <img
-              src="~@/assets/img/imgLeft.png"
-            />
+          <img src="~@/assets/img/imgLeft.png" />
          <div>
-            <h2>{{item.name}}<span>{{item.type}}</span></h2>
+            <h2>
+              {{ item.name }}<span>{{ item.type }}</span>
+            </h2>
            <p>{{ item.describe }}</p>
          </div>
        </li>
@ -61,24 +89,45 @@
    <div class="agreeOr">
      <h3>审批</h3>
      <div>
-        <el-radio-group v-model="agreeOrList" style="width:230px;">
-          <el-radio-button label="同意" class="blueAll">同意</el-radio-button>
-          <el-radio-button label="退回" class="redAll">退回</el-radio-button>
-        </el-radio-group>
-        <el-input v-if="agreeOrList ==='同意' " v-model="inputAgree" placeholder="请输入同意意见"></el-input>
+        <!-- <el-radio-group v-model="agreeOrList" style="width:230px;">
+          <el-radio-button label="同意" class="blueAll" @click="showDialog('同意')">同意</el-radio-button>
+          <el-radio-button label="退回" class="redAll" @click="showDialog('退回')">退回</el-radio-button>
+        </el-radio-group> -->
+        <el-button type="primary" @click="showDialog('同意')">同意</el-button>
+        <el-button type="danger" plain @click="showDialog('拒绝')"
+          >拒绝</el-button
+        >
+        <!-- <el-input v-if="agreeOrList ==='同意' " v-model="inputAgree" placeholder="请输入同意意见"></el-input>
        <el-input v-if="agreeOrList ==='退回'" v-model="inputNo" placeholder="请输入退回意见"></el-input>
-         <el-button class="inputBule" @click="agreeOrNot">提交</el-button>
+         <el-button class="inputBule" @click="agreeOrNot">提交</el-button> -->
      </div>
    </div>

    <!--  流程详情   -->
    <ren-process-detail></ren-process-detail>
+    <el-dialog
+      title="审批意见"
+      :visible.sync="dialogVisible"
+      width="30%"
+      :before-close="handleClose"
+    >
+      <el-input v-model="input" placeholder="请输入审批意见"></el-input>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="handleClose2">取 消</el-button>
+        <el-button
+          type="primary"
+          @click.native="agreeOrNot($store.state.contentTabsActiveName)"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
  </el-card>
 </template>

 <script>
 // 引入工作流公共方法
 import processModule from '@/mixins/process-module'
+// import mixinViewModule from '@/mixins/view-module'
 import debounce from 'lodash/debounce'
 import qs from 'qs'
 import RenProcessDetail from '@/components/ren-process-detail/src/ren-process-detail'
@ -87,6 +136,9 @@ export default {
  mixins: [processModule],
  data () {
    return {
+      dialogVisible: false,
+      dialogType: '',
+      input: '',
      visible: true,
      showKey: 0,
      // 表单属性是否可编辑
@ -156,6 +208,22 @@ export default {
        }
      })
    },
+    showDialog (title) {
+      this.dialogVisible = true
+      this.dialogType = title
+    },
+    handleClose (done) {
+      this.$confirm('确认关闭？')
+        .then((_) => {
+          this.input = ''
+          done()
+        })
+        .catch((_) => {})
+    },
+    handleClose2 () {
+      this.dialogVisible = false
+      this.input = ''
+    },
    downloadFile2 (url) {
      console.log(window.SITE_CONFIG.previewUrl)
      window.open(
@ -167,21 +235,36 @@ export default {
    // 获取信息
    getInfo () {
      this.$http
-        .get(`/act/task/getTaskVariables?taskId=${this.dataForm.taskId}&variableName=tAbilityApplicationDTOList`)
+        .get(
+          `/act/task/getTaskVariables?taskId=${this.dataForm.taskId}&variableName=tAbilityApplicationDTOList`
+        )
        .then(({ data: res }) => {
          if (res.code !== 0) {
            console.log(res.data)
            return this.$message.error(res.msg)
          }
-          console.log(res.data, this.dataForm, 'elas============================')
+          console.log(
+            res.data,
+            this.dataForm,
+            'elas============================'
+          )
          if (res.data.tAbilityApplicationDTOList[0].applicationScene) {
            res.data.tAbilityApplicationDTOList[0].applicationSceneStr = ''
-            res.data.tAbilityApplicationDTOList[0].applicationScene.map((val, index) => {
-              res.data.tAbilityApplicationDTOList[0].applicationSceneStr += val
-              if (index < res.data.tAbilityApplicationDTOList[0].applicationScene.length - 1) {
-                res.data.tAbilityApplicationDTOList[0].applicationSceneStr += '、'
+            res.data.tAbilityApplicationDTOList[0].applicationScene.map(
+              (val, index) => {
+                res.data.tAbilityApplicationDTOList[0].applicationSceneStr +=
+                  val
+                if (
+                  index <
+                  res.data.tAbilityApplicationDTOList[0].applicationScene
+                    .length -
+                    1
+                ) {
+                  res.data.tAbilityApplicationDTOList[0].applicationSceneStr +=
+                    '、'
                }
-            })
+              }
+            )
          }
          this.dataForm.content = res.data.tAbilityApplicationDTOList[0]
          const obj = {
@ -190,12 +273,12 @@ export default {
            describe: ''
          }
          let flag = false
-          res.data.tAbilityApplicationDTOList.map(val => {
+          res.data.tAbilityApplicationDTOList.map((val) => {
            if (val.cameraList) {
              flag = true
              obj.describe += val.system
            } else {
-              this.$http.get('/resource/' + val.resourceId).then(res1 => {
+              this.$http.get('/resource/' + val.resourceId).then((res1) => {
                // console.log(res1.data.data, '1111111111111111111111111111111111')
                this.dataList.push({
                  name: res1.data.data.name,
@ -227,15 +310,18 @@ export default {
        .catch(() => {})
    },
    // 同意与退回
-    agreeOrNot: debounce(function () {
-      if (this.agreeOrList === '同意') {
+    agreeOrNot: debounce(
+      function (data) {
+        if (this.dialogType === '同意') {
          console.log('this.dataForm', this.dataForm)
          const params = qs.stringify({
            taskId: this.dataForm.taskId,
-          comment: this.inputAgree
+            comment: this.input
          })
          console.log(params)
-        this.$http.post('/act/task/complete?' + params).then(({ data: res }) => {
+          this.$http
+            .post('/act/task/complete?' + params)
+            .then(({ data: res }) => {
              if (res.code !== 0) {
                this.$message.error(res.msg)
                if (this.callbacks.taskHandleErrorCallback) {
@ -249,18 +335,22 @@ export default {
                duration: 500,
                onClose: () => {
                  this.visible = false
+                  this.dialogVisible = false
                  if (this.callbacks.taskHandleSuccessCallback) {
                    this.callbacks.taskHandleSuccessCallback(res)
                  }
                }
              })
-        }).catch(() => {})
-      } else if (this.agreeOrList === '退回') {
+            })
+            .catch(() => {})
+        } else if (this.dialogType === '拒绝') {
          const params = qs.stringify({
            taskId: this.dataForm.taskId,
-          comment: this.inputNo
+            comment: this.input
          })
-        this.$http.post('/act/task/backToFirst?', params).then(({ data: res }) => {
+          this.$http
+            .post('/act/task/endProcess?', params)
+            .then(({ data: res }) => {
              if (res.code !== 0) {
                this.$message.error(res.msg)
                if (this.callbacks.taskHandleErrorCallback) {
@ -281,7 +371,38 @@ export default {
              })
            })
        }
-    }, 1000, { leading: true, trailing: false }),
+        this.tabRemoveHandle(data)
+        // this.getDataList(data)
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
+    tabRemoveHandle (tabName) {
+      console.log(tabName, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+      if (tabName === 'home') {
+        return false
+      }
+      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
+        (item) => item.name !== tabName
+      )
+      if (this.$store.state.contentTabs.length <= 0) {
+        this.$store.state.sidebarMenuActiveName =
+          this.$store.state.contentTabsActiveName = 'home'
+        return false
+      }
+      // 当前选中tab被删除
+      if (tabName === this.$store.state.contentTabsActiveName) {
+        const tab =
+          this.$store.state.contentTabs[
+            this.$store.state.contentTabs.length - 1
+          ]
+        this.$router.push({
+          name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name,
+          params: { ...tab.params },
+          query: { ...tab.query }
+        })
+      }
+    },
    // 启动流程出错回调
    startProcessErrorCallback (data) {
      console.log(data)
@ -389,7 +510,7 @@ export default {
    }
    .clearfix:after {
      display: block;
-      content: "";
+      content: '';
      clear: both;
    }
    .title {
@ -399,7 +520,7 @@ export default {
      border-bottom: 0;
    }
    .title:before {
-      content: "";
+      content: '';
      width: 6px;
      height: 6px;
      display: inline-block;
--- a/back/src/views/modules/workBench/components/dept-todo-view.vue
+++ b/back/src/views/modules/workBench/components/dept-todo-view.vue
@ -15,10 +15,11 @@
            <div v-for="(item, i) in dataInfo.list" :key="i">
                <!-- 待办 -->
                <el-tooltip effect="dark" v-if="dataInfo.type === 'todo'"
-                    :content="`${(item.processDefinitionName || '--')}${item.taskName ? ('—' + item.taskName) : ''}`"
+                    :content="(item.userName || '--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'?'申请':'')"
                    placement="top">
                    <div class="list-item ellipsis">
-                        {{ `${(item.processDefinitionName || '--')}${item.taskName ? ('—' + item.taskName) : ''}` }}
+                        <!-- {{ `${(item.processDefinitionName || '--')}${item.taskName ? ('—' + item.taskName) : ''}` }} -->
+                        {{(item.userName || '--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'?'申请':'')}}
                    </div>
                </el-tooltip>
                <!-- 已办 -->
--- a/front/public/index.html
+++ b/front/public/index.html
@ -2,7 +2,7 @@
 * @Author: hisense.wuhongjian
 * @Date: 2022-03-29 16:45:25
 * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-18 18:45:09
+ * @LastEditTime: 2022-07-21 18:17:22
 * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
--- a/front/src/App.vue
+++ b/front/src/App.vue
@ -1,8 +1,8 @@
 <!--
 * @Author: hisense.wuhongjian
 * @Date: 2022-05-06 11:12:00
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-20 11:05:25
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-07-21 17:09:10
 * @Description: 告诉大家这是什么
 -->
 <template>
@ -12,17 +12,42 @@
    </a-config-provider>
  </div>
 </template>
-<script>
+<script setup>
  import zhCN from 'ant-design-vue/es/locale/zh_CN'
+  import Cookies from 'js-cookie'
+  import { onBeforeUnmount } from 'vue'
+  import { useRouter } from 'vue-router'
+  import mybus from '@/myplugins/mybus'
+  const router = useRouter()

-  export default {
-    name: 'App',
-    data() {
-      return {
-        locale: zhCN,
+  // export default {
+  //   name: 'App',
+  //   data() {
+  //     return {
+  //       ,
+  //     }
+  //   },
+  // }
+  const locale = zhCN
+  const token = Cookies.get('ucsToken')
+  console.log('token=================>', token)
+  var ws = new WebSocket(
+    `ws://${window.SITE_CONFIG['websocketURL']}/websocket?token=${token}`
+  )
+  // ws.send()给服务器发送信息
+  // 服务器每次返回信息都会执行一次onmessage方法
+  ws.onmessage = function (e) {
+    console.log('服务器返回的信息: ' + e.data)
+    mybus.emit('getMynotice')
+    // 判断当前路由是否是消息中心
+    if (router.currentRoute.value.name === 'mynoticeView') {
+      mybus.emit('noticeListInit')
    }
-    },
  }
+  onBeforeUnmount(() => {
+    // 4.卸载前, 关闭链接
+    ws.close()
+  })
 </script>
 <style lang="less">
  @import '~@/vab/styles/vab.less';
--- a/front/src/api/personalCenter.js
+++ b/front/src/api/personalCenter.js
@ -260,3 +260,18 @@ export function filesUpload(data) {
    data,
  })
 }
+// 根据Id查询归属部门
+export function deptIdQuery(params) {
+  return request({
+    url: '/sys/dept/' + params,
+    method: 'get',
+  })
+}
+//能力下架分页
+export function AbilityToPullDownPages(params) {
+  return request({
+    url: '/processForm/tabilityapplication/in_use_page',
+    method: 'get',
+    params,
+  })
+}
--- a/front/src/assets/personalCenter/Capabilitydiagram.png
+++ b/front/src/assets/personalCenter/Capabilitydiagram.png
--- a/front/src/views/abilityStatistics/components/AtlasResources.vue
+++ b/front/src/views/abilityStatistics/components/AtlasResources.vue
@ -270,7 +270,12 @@
      departmentList.value = res.data.data.deptList
    }
    nextTick(() => {
-      console.log('生成气泡=================>', res, navSelect.value)
+      console.log(
+        '生成气泡=================>',
+        res,
+        navSelect.value,
+        bubbleList.value
+      )
      coordinate.value = []
      bubbleRandom(1)
      bubbleRandom(2)
@ -712,7 +717,7 @@
            position: absolute;
            opacity: 0;
            top: 2.59rem;
-            left: 471.05rem;
+            left: 4.71rem;
            transition: all 1s;
            span {
              overflow: hidden;
--- a/front/src/views/capacityOnTheShelf/Application.vue
+++ b/front/src/views/capacityOnTheShelf/Application.vue
@ -24,6 +24,7 @@
    <div class="vue-box">
      <put-on-the-shelf
        v-if="showView === '基本信息' && refData.name"
+        ref="refPutOnTheShelf"
        :refData="refData"
        :dataFrom="dataFrom"
        :videoList="videoList"
@ -38,15 +39,21 @@
      ></put-on-the-shelf>
      <put-on-the-shelf
        v-else-if="showView === '功能介绍'"
+        ref="refPutOnTheShelf"
        :refData="refData"
        :dataFrom="dataFrom"
        :configure="gnjs"
+        @next="next()"
+        @back="back()"
      ></put-on-the-shelf>
      <put-on-the-shelf
        v-else-if="showView === '关联组件'"
+        ref="refPutOnTheShelf"
        :refData="refData"
        :dataFrom="dataFrom"
        :configure="glzj"
+        @next="next()"
+        @back="back()"
      ></put-on-the-shelf>
      <put-on-the-shelf
        v-else-if="showView === '部署与应用'"
@ -54,6 +61,8 @@
        :dataFrom="dataFrom"
        :externalField="['共享条件', '共享类型']"
        :configure="bs"
+        @submit="submit()"
+        @back="back()"
      ></put-on-the-shelf>
      <!-- <application-essential-information
        v-if="showView === '基本信息' && refData.name"
@ -82,12 +91,72 @@
    </div>
    <div class="btn" :class="showView === '基本信息' ? 'first' : ''">
      <button @click="close()">取消</button>
-      <button v-show="showView !== '基本信息'" @click="back()">上一步</button>
+
+      <a-popconfirm
+        v-if="
+          showView == '功能介绍' &&
+          gnjs[0].list.filter((val) => val.note1 !== '').length > 0 &&
+          gnjs[0].list.filter((val) => val.note1 !== '').length !==
+            gnjs[0].list.length
+        "
+        title="如果信息未填写完整将会被丢弃，是否返回上一步?"
+        ok-text="是"
+        cancel-text="否"
+        @confirm="changeGnjs('上一步')"
+        @cancel="cancel"
+      >
+        <button>上一步</button>
+      </a-popconfirm>
+      <button v-else-if="showView == '功能介绍'" @click="changeGnjs('上一步')">
+        上一步
+      </button>
+      <!-- 分割线 -->
+      <button
+        v-show="showView !== '基本信息' && showView === '部署与应用'"
+        @click="back()"
+      >
+        上一步
+      </button>
      <button v-show="showView === '部署与应用'" @click="preview()">
        预览
      </button>
-      <button v-show="showView !== '部署与应用'" @click="next()">下一步</button>
-      <button v-show="showView === '部署与应用'" @click="submit()">提交</button>
+      <button v-show="showView === '基本信息'" @click="next()">下一步</button>
+      <a-popconfirm
+        v-if="
+          showView == '功能介绍' &&
+          gnjs[0].list.filter((val) => val.note1 !== '').length > 0 &&
+          gnjs[0].list.filter((val) => val.note1 !== '').length !==
+            gnjs[0].list.length
+        "
+        title="如果信息未填写完整将会被丢弃，是否进行下一步?"
+        ok-text="是"
+        cancel-text="否"
+        @confirm="changeGnjs('下一步')"
+        @cancel="cancel"
+      >
+        <button>下一步</button>
+      </a-popconfirm>
+      <button v-else-if="showView == '功能介绍'" @click="changeGnjs('下一步')">
+        下一步
+      </button>
+      <a-popconfirm
+        v-if="
+          showView === '部署与应用' &&
+          bs[0].list.filter(
+            (val) => val.note1 !== '' && val.name !== '常见问题'
+          ).length > 0
+        "
+        title="如果常见问题未填写完整将会被丢弃，是否进行提交?"
+        ok-text="是"
+        cancel-text="否"
+        @confirm="changeBs('提交')"
+        @cancel="cancel"
+      >
+        <button>提交</button>
+      </a-popconfirm>
+      <button v-else-if="showView === '部署与应用'" @click="submit()">
+        提交
+      </button>
    </div>
  </div>
 </template>
@ -291,6 +360,16 @@
      console.log('所有编目结构==============>', res.data.data)
    })
  }
+  // 特殊字段处理
+  const refPutOnTheShelf = ref(null)
+  const changeGnjs = (type) => {
+    refPutOnTheShelf.value.add('功能介绍', true, type)
+    console.log(refPutOnTheShelf.value)
+  }
+  const changeBs = (type) => {
+    console.log(refPutOnTheShelf)
+    refPutOnTheShelf.value.add('常见问题', true, type)
+  }
  init()
  mybus.on('chageDataFrom', (obj) => {
    if (obj.attrType == '技术文档' && obj.attrValue != null) {
--- a/front/src/views/capacityOnTheShelf/BusinessComponent.vue
+++ b/front/src/views/capacityOnTheShelf/BusinessComponent.vue
@ -24,6 +24,7 @@
    <div class="vue-box">
      <put-on-the-shelf
        v-if="showView === '基本信息' && refData.name"
+        ref="refPutOnTheShelf"
        :refData="refData"
        :dataFrom="dataFrom"
        :videoList="videoList"
@ -39,34 +40,163 @@
      ></put-on-the-shelf>
      <put-on-the-shelf
        v-else-if="showView === '功能介绍'"
+        ref="refPutOnTheShelf"
        :refData="refData"
        :dataFrom="dataFrom"
        :configure="gnjs"
+        @next="next()"
+        @back="back()"
      ></put-on-the-shelf>
      <put-on-the-shelf
        v-else-if="showView === '应用场景'"
+        ref="refPutOnTheShelf"
        :refData="refData"
        :dataFrom="dataFrom"
        :configure="yycj"
+        @next="next()"
+        @back="back()"
      ></put-on-the-shelf>
      <put-on-the-shelf
        v-else-if="showView === '部署与使用'"
+        ref="refPutOnTheShelf"
        :refData="refData"
        :dataFrom="dataFrom"
        :fileList="fileList"
        :fileList2="fileList2"
        :imgList="imgList"
        :configure="bs"
+        @submit="submit()"
+        @back="back()"
      ></put-on-the-shelf>
    </div>
    <div class="btn" :class="showView === '基本信息' ? 'first' : ''">
      <button @click="close()">取消</button>
-      <button v-show="showView !== '基本信息'" @click="back()">上一步</button>
+      <a-popconfirm
+        v-if="
+          showView == '功能介绍' &&
+          gnjs[0].list.filter((val) => val.note1 !== '').length > 0 &&
+          gnjs[0].list.filter((val) => val.note1 !== '').length !==
+            gnjs[0].list.length
+        "
+        title="如果信息未填写完整将会被丢弃，是否返回上一步?"
+        ok-text="是"
+        cancel-text="否"
+        @confirm="changeGnjs('上一步')"
+        @cancel="cancel"
+      >
+        <button>上一步</button>
+      </a-popconfirm>
+      <button
+        v-else-if="
+          showView == '功能介绍' &&
+          gnjs[0].list.filter((val) => val.note1 !== '').length ==
+            gnjs[0].list.length
+        "
+        @click="changeSfys('上一步')"
+      >
+        上一步
+      </button>
+      <a-popconfirm
+        v-else-if="
+          showView == '应用场景' &&
+          yycj[0].list.filter((val) => val.note1 !== '').length > 0 &&
+          yycj[0].list.filter((val) => val.note1 !== '').length !==
+            yycj[0].list.length
+        "
+        title="如果信息未填写完整将会被丢弃，是否返回上一步?"
+        ok-text="是"
+        cancel-text="否"
+        @confirm="changeYycj('上一步')"
+        @cancel="cancel"
+      >
+        <button>上一步</button>
+      </a-popconfirm>
+      <button
+        v-else-if="
+          showView == '应用场景' &&
+          yycj[0].list.filter((val) => val.note1 !== '').length ==
+            yycj[0].list.length
+        "
+        @click="changeYycj('上一步')"
+      >
+        上一步
+      </button>
+      <button v-else-if="showView !== '基本信息'" @click="back()">
+        上一步
+      </button>
      <button v-show="showView === '部署与使用'" @click="preview()">
        预览
      </button>
-      <button v-show="showView !== '部署与使用'" @click="next()">下一步</button>
-      <button v-show="showView === '部署与使用'" @click="submit()">提交</button>
+      <a-popconfirm
+        v-if="
+          showView == '功能介绍' &&
+          gnjs[0].list.filter((val) => val.note1 !== '').length > 0 &&
+          gnjs[0].list.filter((val) => val.note1 !== '').length !==
+            gnjs[0].list.length
+        "
+        title="如果信息未填写完整将会被丢弃，是否进行下一步?"
+        ok-text="是"
+        cancel-text="否"
+        @confirm="changeGnjs('下一步')"
+        @cancel="cancel"
+      >
+        <button>下一步</button>
+      </a-popconfirm>
+      <button
+        v-else-if="
+          showView == '功能介绍' &&
+          gnjs[0].list.filter((val) => val.note1 !== '').length ==
+            gnjs[0].list.length
+        "
+        @click="changeGnjs('下一步')"
+      >
+        下一步
+      </button>
+      <a-popconfirm
+        v-else-if="
+          showView == '应用场景' &&
+          yycj[0].list.filter((val) => val.note1 !== '').length > 0 &&
+          yycj[0].list.filter((val) => val.note1 !== '').length !==
+            yycj[0].list.length
+        "
+        title="如果信息未填写完整将会被丢弃，是否进行下一步?"
+        ok-text="是"
+        cancel-text="否"
+        @confirm="changeYycj('下一步')"
+        @cancel="cancel"
+      >
+        <button>下一步</button>
+      </a-popconfirm>
+      <button
+        v-else-if="
+          showView == '应用场景' &&
+          yycj[0].list.filter((val) => val.note1 !== '').length ==
+            yycj[0].list.length
+        "
+        @click="changeYycj('下一步')"
+      >
+        下一步
+      </button>
+      <button v-else-if="showView !== '部署与使用'" @click="next()">
+        下一步
+      </button>
+      <a-popconfirm
+        v-if="
+          showView === '部署与使用' &&
+          (bs[0].list.filter((val) => val.note1 !== '').length > 0 ||
+            bs[1].list.filter((val) => val.note1 !== '').length > 0)
+        "
+        title="如果常见问题未填写完整将会被丢弃，是否进行提交?"
+        ok-text="是"
+        cancel-text="否"
+        @confirm="changeBs('提交')"
+        @cancel="cancel"
+      >
+        <button>提交</button>
+      </a-popconfirm>
+      <button v-else-if="showView === '部署与使用'" @click="submit()">
+        提交
+      </button>
    </div>
  </div>
 </template>
@ -279,6 +409,19 @@
      })
    }
  }
+  // 特殊字段处理
+  const refPutOnTheShelf = ref(null)
+  const changeGnjs = (type) => {
+    refPutOnTheShelf.value.add('功能介绍', true, type)
+  }
+  const changeYycj = (type) => {
+    console.log(refPutOnTheShelf)
+    refPutOnTheShelf.value.add('应用场景', true, type)
+  }
+  const changeBs = (type) => {
+    console.log(refPutOnTheShelf)
+    refPutOnTheShelf.value.add('常见问题', true, type)
+  }
  const init = () => {
    getCategoryTree().then((res) => {
      // console.clear()
--- a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue
+++ b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue
@ -40,33 +40,162 @@
      ></put-on-the-shelf>
      <put-on-the-shelf
        v-else-if="showView === '功能介绍'"
+        ref="refPutOnTheShelf"
        :refData="refData"
        :dataFrom="dataFrom"
        :configure="gnjs"
+        @next="next()"
+        @back="back()"
      ></put-on-the-shelf>
      <put-on-the-shelf
        v-else-if="showView === '应用场景'"
+        ref="refPutOnTheShelf"
        :refData="refData"
        :dataFrom="dataFrom"
        :configure="yycj"
+        @next="next()"
+        @back="back()"
      ></put-on-the-shelf>
      <put-on-the-shelf
        v-else-if="showView === '部署与使用'"
+        ref="refPutOnTheShelf"
        :refData="refData"
        :dataFrom="dataFrom"
        :fileList="fileList"
        :fileList2="fileList2"
        :configure="bs"
+        @submit="submit()"
+        @back="back()"
      ></put-on-the-shelf>
    </div>
    <div class="btn" :class="showView === '基本信息' ? 'first' : ''">
      <button @click="close()">取消</button>
-      <button v-show="showView !== '基本信息'" @click="back()">上一步</button>
+      <a-popconfirm
+        v-if="
+          showView == '功能介绍' &&
+          gnjs[0].list.filter((val) => val.note1 !== '').length > 0 &&
+          gnjs[0].list.filter((val) => val.note1 !== '').length !==
+            gnjs[0].list.length
+        "
+        title="如果信息未填写完整将会被丢弃，是否返回上一步?"
+        ok-text="是"
+        cancel-text="否"
+        @confirm="changeGnjs('上一步')"
+        @cancel="cancel"
+      >
+        <button>上一步</button>
+      </a-popconfirm>
+      <button
+        v-else-if="
+          showView == '功能介绍' &&
+          gnjs[0].list.filter((val) => val.note1 !== '').length ==
+            gnjs[0].list.length
+        "
+        @click="changeSfys('上一步')"
+      >
+        上一步
+      </button>
+      <a-popconfirm
+        v-else-if="
+          showView == '应用场景' &&
+          yycj[0].list.filter((val) => val.note1 !== '').length > 0 &&
+          yycj[0].list.filter((val) => val.note1 !== '').length !==
+            yycj[0].list.length
+        "
+        title="如果信息未填写完整将会被丢弃，是否返回上一步?"
+        ok-text="是"
+        cancel-text="否"
+        @confirm="changeYycj('上一步')"
+        @cancel="cancel"
+      >
+        <button>上一步</button>
+      </a-popconfirm>
+      <button
+        v-else-if="
+          showView == '应用场景' &&
+          yycj[0].list.filter((val) => val.note1 !== '').length ==
+            yycj[0].list.length
+        "
+        @click="changeYycj('上一步')"
+      >
+        上一步
+      </button>
+      <button v-else-if="showView !== '基本信息'" @click="back()">
+        上一步
+      </button>
      <button v-show="showView === '部署与使用'" @click="preview()">
        预览
      </button>
-      <button v-show="showView !== '部署与使用'" @click="next()">下一步</button>
-      <button v-show="showView === '部署与使用'" @click="submit()">提交</button>
+      <a-popconfirm
+        v-if="
+          showView == '功能介绍' &&
+          gnjs[0].list.filter((val) => val.note1 !== '').length > 0 &&
+          gnjs[0].list.filter((val) => val.note1 !== '').length !==
+            gnjs[0].list.length
+        "
+        title="如果信息未填写完整将会被丢弃，是否进行下一步?"
+        ok-text="是"
+        cancel-text="否"
+        @confirm="changeGnjs('下一步')"
+        @cancel="cancel"
+      >
+        <button>下一步</button>
+      </a-popconfirm>
+      <button
+        v-else-if="
+          showView == '功能介绍' &&
+          gnjs[0].list.filter((val) => val.note1 !== '').length ==
+            gnjs[0].list.length
+        "
+        @click="changeGnjs('下一步')"
+      >
+        下一步
+      </button>
+      <a-popconfirm
+        v-else-if="
+          showView == '应用场景' &&
+          yycj[0].list.filter((val) => val.note1 !== '').length > 0 &&
+          yycj[0].list.filter((val) => val.note1 !== '').length !==
+            yycj[0].list.length
+        "
+        title="如果信息未填写完整将会被丢弃，是否进行下一步?"
+        ok-text="是"
+        cancel-text="否"
+        @confirm="changeYycj('下一步')"
+        @cancel="cancel"
+      >
+        <button>下一步</button>
+      </a-popconfirm>
+      <button
+        v-else-if="
+          showView == '应用场景' &&
+          yycj[0].list.filter((val) => val.note1 !== '').length ==
+            yycj[0].list.length
+        "
+        @click="changeYycj('下一步')"
+      >
+        下一步
+      </button>
+      <button v-else-if="showView !== '部署与使用'" @click="next()">
+        下一步
+      </button>
+      <a-popconfirm
+        v-if="
+          showView === '部署与使用' &&
+          (bs[0].list.filter((val) => val.note1 !== '').length > 0 ||
+            bs[1].list.filter((val) => val.note1 !== '').length > 0)
+        "
+        title="如果常见问题未填写完整将会被丢弃，是否进行提交?"
+        ok-text="是"
+        cancel-text="否"
+        @confirm="changeBs('提交')"
+        @cancel="cancel"
+      >
+        <button>提交</button>
+      </a-popconfirm>
+      <button v-else-if="showView === '部署与使用'" @click="submit()">
+        提交
+      </button>
    </div>
  </div>
 </template>
@ -242,6 +371,19 @@
    })
    window.open(newpage.href, '_blank')
  }
+  // 特殊字段处理
+  const refPutOnTheShelf = ref(null)
+  const changeGnjs = (type) => {
+    refPutOnTheShelf.value.add('功能介绍', true, type)
+  }
+  const changeYycj = (type) => {
+    console.log(refPutOnTheShelf)
+    refPutOnTheShelf.value.add('应用场景', true, type)
+  }
+  const changeBs = (type) => {
+    console.log(refPutOnTheShelf)
+    refPutOnTheShelf.value.add('常见问题', true, type)
+  }
  const submit = () => {
    console.log('提交数据=============>', dataFrom.value)
    if (submitFlag.value) {
--- a/front/src/views/capacityOnTheShelf/LayerServices.vue
+++ b/front/src/views/capacityOnTheShelf/LayerServices.vue
@ -24,6 +24,7 @@
    <div class="vue-box">
      <put-on-the-shelf
        v-if="showView === '基本信息' && refData.name"
+        ref="refPutOnTheShelf"
        :refData="refData"
        :dataFrom="dataFrom"
        :imgList="imgList"
@ -39,32 +40,108 @@
      ></put-on-the-shelf>
      <put-on-the-shelf
        v-else-if="showView === '图层信息'"
+        ref="refPutOnTheShelf"
        :refData="refData"
        :dataFrom="dataFrom"
      ></put-on-the-shelf>
      <put-on-the-shelf
        v-else-if="showView === '应用场景'"
+        ref="refPutOnTheShelf"
        :refData="refData"
        :dataFrom="dataFrom"
        :configure="yycj"
+        @next="next()"
+        @back="back()"
      ></put-on-the-shelf>
      <put-on-the-shelf
        v-else-if="showView === '部署与使用'"
+        ref="refPutOnTheShelf"
        :refData="refData"
        :dataFrom="dataFrom"
        :fileList="fileList"
        :fileList2="fileList2"
        :configure="bs"
+        @submit="submit()"
+        @back="back()"
      ></put-on-the-shelf>
    </div>
    <div class="btn" :class="showView === '基本信息' ? 'first' : ''">
      <button @click="close()">取消</button>
-      <button v-show="showView !== '基本信息'" @click="back()">上一步</button>
+      <a-popconfirm
+        v-if="
+          showView == '应用场景' &&
+          yycj[0].list.filter((val) => val.note1 !== '').length > 0 &&
+          yycj[0].list.filter((val) => val.note1 !== '').length !==
+            yycj[0].list.length
+        "
+        title="如果信息未填写完整将会被丢弃，是否返回上一步?"
+        ok-text="是"
+        cancel-text="否"
+        @confirm="changeYycj('上一步')"
+        @cancel="cancel"
+      >
+        <button>上一步</button>
+      </a-popconfirm>
+      <button
+        v-else-if="
+          showView == '应用场景' &&
+          yycj[0].list.filter((val) => val.note1 !== '').length ==
+            yycj[0].list.length
+        "
+        @click="changeYycj('上一步')"
+      >
+        上一步
+      </button>
+      <button v-else-if="showView !== '基本信息'" @click="back()">
+        上一步
+      </button>
      <button v-show="showView === '部署与使用'" @click="preview()">
        预览
      </button>
-      <button v-show="showView !== '部署与使用'" @click="next()">下一步</button>
-      <button v-show="showView === '部署与使用'" @click="submit()">提交</button>
+      <a-popconfirm
+        v-if="
+          showView == '应用场景' &&
+          yycj[0].list.filter((val) => val.note1 !== '').length > 0 &&
+          yycj[0].list.filter((val) => val.note1 !== '').length !==
+            yycj[0].list.length
+        "
+        title="如果信息未填写完整将会被丢弃，是否进行下一步?"
+        ok-text="是"
+        cancel-text="否"
+        @confirm="changeYycj('下一步')"
+        @cancel="cancel"
+      >
+        <button>下一步</button>
+      </a-popconfirm>
+      <button
+        v-else-if="
+          showView == '应用场景' &&
+          yycj[0].list.filter((val) => val.note1 !== '').length ==
+            yycj[0].list.length
+        "
+        @click="changeYycj('下一步')"
+      >
+        下一步
+      </button>
+      <button v-else-if="showView !== '部署与使用'" @click="next()">
+        下一步
+      </button>
+      <a-popconfirm
+        v-if="
+          showView === '部署与使用' &&
+          bs[0].list.filter((val) => val.note1 !== '').length > 0
+        "
+        title="如果常见问题未填写完整将会被丢弃，是否进行提交?"
+        ok-text="是"
+        cancel-text="否"
+        @confirm="changeBs('提交')"
+        @cancel="cancel"
+      >
+        <button>提交</button>
+      </a-popconfirm>
+      <button v-else-if="showView === '部署与使用'" @click="submit()">
+        提交
+      </button>
    </div>
  </div>
 </template>
@ -190,6 +267,16 @@
    })
    window.open(newpage.href, '_blank')
  }
+  // 特殊字段处理
+  const refPutOnTheShelf = ref(null)
+  const changeYycj = (type) => {
+    console.log(refPutOnTheShelf)
+    refPutOnTheShelf.value.add('应用场景', true, type)
+  }
+  const changeBs = (type) => {
+    console.log(refPutOnTheShelf)
+    refPutOnTheShelf.value.add('常见问题', true, type)
+  }
  const submit = () => {
    console.log('提交数据=============>', dataFrom.value)
    if (submitFlag.value) {
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue
@ -280,7 +280,7 @@
      message.config({
        top: '100px', // 距离顶部的位置
      })
-      message.error('暂未上传技术文档')
+      message.error('暂未开放技术文档')
    }
  }
  function technicalNew() {
--- a/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue
@ -60,12 +60,12 @@
    dataFrom.value.content[0].childrenContent[0] = obj
    let deptContacts = {
      attrType: '部门联系人',
-      attrValue: '',
+      attrValue: props.dataList.deptContacts || '------',
    }
    dataFrom.value.content[0].childrenContent[1] = deptContacts
    let deptPhone = {
      attrType: '部门联系电话',
-      attrValue: '',
+      attrValue: props.dataList.deptPhone || '------',
    }
    dataFrom.value.content[0].childrenContent[2] = deptPhone
    props.dataList.infoList.map((item) => {
--- a/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue
@ -2,7 +2,7 @@
 * @Author: hisense.liangjunhua
 * @Date: 2022-06-08 11:56:28
 * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-20 15:02:12
+ * @LastEditTime: 2022-07-21 18:17:30
 * @Description: 算法详情页头部
 -->
 <template>
@ -44,14 +44,14 @@
        </a-tooltip>
      </div>
      <div class="bottom" v-if="props.dataList.id">
-        <!-- <a-button type="primary" @click="toView()">
+        <a-button type="primary" @click="toView()">
          <template #icon><form-outlined /></template>
          申请使用
        </a-button>
        <a-button type="primary" @click="addShoppingCart()">
          <template #icon><shopping-cart-outlined /></template>
          加入购物车
-        </a-button> -->
+        </a-button>
        <!-- 融合服务 存在fuseResourceList -->
        <a-button
          type="primary"
@ -75,11 +75,10 @@
  // import { ShoppingCartOutlined } from '@ant-design/icons-vue'
  import { defineProps, ref, watch } from 'vue'
  import { scInsert, scDel } from '@/api/personalCenter'
-  // import { sgcInsert } from '@/api/home'
-  // import { useRouter } from 'vue-router'
-  // import mybus from '@/myplugins/mybus'
-  import { message } from 'ant-design-vue'
+  import { sgcInsert } from '@/api/home'
  import { useRouter } from 'vue-router'
+  import mybus from '@/myplugins/mybus'
+  import { message } from 'ant-design-vue'
  // 获取当前路由地址
  const router = useRouter()

@ -88,25 +87,23 @@
  })

  console.log('dataList------------>', props.dataList)
-
-  // const router = useRouter()
  const applicationArea = ref('')
  // // 加入申购车
-  // const addShoppingCart = () => {
-  //   console.log('加入申购车==================>', props.dataList)
-  //   sgcInsert({
-  //     delFlag: '0',
-  //     resourceId: props.dataList.id,
-  //     // userId: userId.value,
-  //   }).then((res) => {
-  //     console.log(res)
-  //     message.success('添加申购车成功！')
-  //     mybus.emit('getSgcNum')
-  //   })
-  // }
+  const addShoppingCart = () => {
+    console.log('加入申购车==================>', props.dataList)
+    sgcInsert({
+      delFlag: '0',
+      resourceId: props.dataList.id,
+      // userId: userId.value,
+    }).then((res) => {
+      console.log(res)
+      message.success('添加申购车成功！')
+      mybus.emit('getSgcNum')
+    })
+  }
  // // 立即申请
-  // function toView() {
-  //   // window.open(newpage.href, '_blank')
+  function toView() {
+    // window.open(newpage.href, '_blank')
    // router.push({
    //   path: '/apply',
    //   query: {
@ -114,7 +111,31 @@
    //     resourceId: [props.dataList.id],
    //   },
    // })
-  // }
+    console.log('一键申请===================>', props.dataList)
+    localStorage.setItem(
+      'applyList',
+      JSON.stringify([
+        {
+          arr: [
+            {
+              delFlag: props.dataList.delFlag,
+              description: props.dataList.description,
+              resourceId: props.dataList.id,
+              resourceName: props.dataList.name,
+              time: props.dataList.createDate,
+              type: props.dataList.type,
+              // componentType: '智能算法',
+            },
+          ],
+          deptId: props.dataList.deptId,
+          deptName: props.dataList.deptName,
+        },
+      ])
+    )
+    router.push({
+      path: '/apply',
+    })
+  }
  // 融合服务--一键申请
  const handleAKeyApplication = () => {
    let _applyList = []
@ -149,7 +170,7 @@
    console.log('收藏===================》', props.dataList)
    if (scFlag2.value) {
      scFlag2.value = false
-      if (props.dataList.isCollect) {
+      if (props.dataList.isCollect == 'true') {
        scDel([props.dataList.id]).then((res) => {
          if (res.data.msg === 'success') {
            message.success('取消成功')
--- a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue
+++ b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue
@ -214,7 +214,7 @@
      message.config({
        top: '100px', // 距离顶部的位置
      })
-      message.error('暂未上传技术文档')
+      message.error('暂未开放技术文档')
    }
  }
  function technicalNew() {
--- a/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue
+++ b/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue
@ -47,6 +47,8 @@
  import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
  import { ref, defineProps, watch } from 'vue'
  import { pinyin } from 'pinyin-pro'
+  import { message } from 'ant-design-vue'
+
  let flag = ref(true)
  let dataFrom = ref({
    title: '使用方式',
@ -137,23 +139,42 @@
    let obj = props.dataList.infoList.filter(
      (item) => item.attrType === '技术文档'
    )[0]
-    console.log('dataFrom.value.link', obj.attrValue)
-    window.open(
-      window.SITE_CONFIG.frontUrl +
-        'hisense_office/onlinePreview?url=' +
-        btoa(encodeURI(obj.attrValue))
-    )
+    if (obj) {
+      window.open(window.SITE_CONFIG.frontUrl + obj.attrValue)
+    } else {
+      message.config({
+        top: '100px', // 距离顶部的位置
+      })
+      message.error('暂未开放技术文档')
+    }
+    // window.open(
+    //   window.SITE_CONFIG.frontUrl +
+    //     'hisense_office/onlinePreview?url=' +
+    //     btoa(encodeURI(obj.attrValue))
+    // )
  }
  function technicaltow() {
    let obj = props.dataList.infoList.filter(
      (item) => item.attrType === '使用手册'
    )[0]
-    console.log('dataFrom.value.link', obj.attrValue)
+    // console.log('dataFrom.value.link', obj.attrValue)
+    // window.open(
+    //   window.SITE_CONFIG.previewUrl +
+    //     'hisense_office/onlinePreview?url=' +
+    //     btoa(encodeURI(obj.attrValue))
+    // )
+    if (obj) {
      window.open(
        window.SITE_CONFIG.previewUrl +
          'hisense_office/onlinePreview?url=' +
          btoa(encodeURI(obj.attrValue))
      )
+    } else {
+      message.config({
+        top: '100px', // 距离顶部的位置
+      })
+      message.error('暂未上传使用手册')
+    }
  }
  watch(
    () => props.dataList,
--- a/front/src/views/detailsAll/components/LayerService/LayerServicePresentation.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServicePresentation.vue
@ -2,7 +2,7 @@
 * @Author: hisense.liangjunhua
 * @Date: 2022-06-08 15:25:33
 * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-14 11:30:52
+ * @LastEditTime: 2022-07-21 17:02:03
 * @Description: 图层展示  视频播放
 -->
 <template>
@ -78,4 +78,9 @@
      }
    }
  }
+  img {
+    width: 100%;
+    height: 100%;
+    object-fit: contain;
+  }
 </style>
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@ -1141,6 +1141,9 @@
        console.log('paramsGetResources', paramsGetResources)
      })
      mybus.on('changeSelcted', () => {
+        // 添加申购车后，返回第一页
+        paramsGetResources.pageNum = 1
+        currentPage.value = 1
        getAppResources()
      })
      mybus.on('changeInfo', (info) => {
@ -1161,6 +1164,9 @@
        getAppResources()
      })
      mybus.on('changeCondition', (condition) => {
+        // 回到第一页，分页页码为1
+        paramsGetResources.pageNum = 1
+        currentPage.value = 1
        //  orderField: 'total' total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
        // orderType: 'ASC'  ASC 升序  DESC 降序
        paramsGetResources.orderField = condition.orderField
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@ -312,7 +312,8 @@
                num.value > 1 ? '等能力申请' + num.value + '个' : '能力申请'
              )
          : list.value[0].arr[0].resourceName.concat('能力申请'), // 标题
-        applicationSystem: [], // 应用系统
+        applicationSystem: '', // 应用系统
+        // applicationSystem: [], // 应用系统
        applicationScene: [], // 应用领域
        applicationBackground: '', // 应用背景
        effectWish: '', // 期望效果
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@ -162,6 +162,8 @@
  const logout = async () => {
    await store.dispatch('user/logout')
    window.sessionStorage.setItem('visits', JSON.stringify([]))
+    // 西海岸不返回登录页
+    if (!whoShow1.itShowXiHaiAn) {
      if (recordRoute) {
        const fullPath = route.fullPath
        router.push(`/login?redirect=${fullPath}`)
@ -169,6 +171,7 @@
        router.push('/login')
      }
    }
+  }
  // 跳转页面
  const jumpPage = (item) => {
    // console.log(item)
@ -281,6 +284,8 @@
  //     getMynotice()
  //   })
  // }
+  // 建立链接 -- 携带cookie参数
+
  onMounted(() => {
    getSgcTotal().then((res) => {
      // console.log('初始化========================>', res.data.data.count)
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@ -162,7 +162,11 @@
            >
              <span>{{ item.shareType || '--' }}</span>
            </div> -->
-            <div v-if="selectCardsname !== '融合服务'">
+            <div
+              v-if="
+                selectCardsname !== '融合服务' && selectCardsname !== '基础设施'
+              "
+            >
              <span>{{ item.deptName || '--' }}</span>
            </div>
          </div>
--- a/front/src/views/mynoticeView/components/NoticeList.vue
+++ b/front/src/views/mynoticeView/components/NoticeList.vue
@ -2,7 +2,7 @@
 * @Author: hisense.liangjunhua
 * @Date: 2022-06-21 11:55:07
 * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-01 17:03:24
+ * @LastEditTime: 2022-07-21 17:05:11
 * @Description: 告诉大家这是什么
 -->
 <template>
@ -111,7 +111,7 @@
 </template>
 <script setup>
  // import { SearchOutlined } from '@ant-design/icons-vue'
-  import { ref, reactive } from 'vue'
+  import { ref, reactive, onBeforeUnmount } from 'vue'
  import mybus from '@/myplugins/mybus'
  import { message } from 'ant-design-vue'
  import { mynotice, mynoticeRead } from '@/api/home'
@ -283,6 +283,12 @@
    }
  })
  init()
+  mybus.on('noticeListInit', () => {
+    init()
+  })
+  onBeforeUnmount(() => {
+    mybus.off('noticeListInit')
+  })
 </script>
 <style lang="less" scoped>
  .notice-list {
--- a/front/src/views/newHome/components/Navigation.vue
+++ b/front/src/views/newHome/components/Navigation.vue
@ -56,7 +56,7 @@
            </a-select-option>
          </a-select>
        </a-form-item>
-        <a-form-item label="技术领域">
+        <!-- <a-form-item label="技术领域">
          <a-select
            ref="select"
            style="width: 1.8rem; height: 0.4rem"
@ -72,7 +72,7 @@
              {{ item.dict_label }}
            </a-select-option>
          </a-select>
-        </a-form-item>
+        </a-form-item> -->
      </div>
      <div class="qushi-class-father">
        <!-- <div class="qushi-class">
--- a/front/src/views/personalCenter/components/AbilityApplication.vue
+++ b/front/src/views/personalCenter/components/AbilityApplication.vue
@ -2,7 +2,7 @@
 * @Author: hisense.liangjunhua
 * @Date: 2022-07-12 09:42:44
 * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-18 17:54:55
+ * @LastEditTime: 2022-07-21 17:25:45
 * @Description:我的申请 能力申请 查看详情
 -->
 <template>
@ -13,14 +13,17 @@
        <p class="item">
          <span>申请标题：{{ props.refObj.title }}</span>
          <span>申请单号：{{ props.refObj.applyNumber || '--' }}</span>
-          <span>应用系统：{{ props.refObj.applicationSystem }}</span>
+          <span v-if="props.refObj.applicationSystem">
+            应用系统：{{ props.refObj.applicationSystem }}
+          </span>
+          <span v-else></span>
        </p>
        <p class="item">
          <span>申请人信息：{{ props.refObj.user }}</span>
          <span>电话：{{ props.refObj.phone }}</span>
          <span>单位：{{ props.refObj.unit }}</span>
        </p>
-        <p>
+        <p v-if="props.refObj.applicationScene.length > 0">
          <span>应用场景：{{ props.refObj.applicationScene.join('；') }}</span>
        </p>
        <p>
@ -104,11 +107,16 @@
                    }}
                  </span>
                </div>
-                <div class="btn" v-if="val.type == '组件服务'">技术文档</div>
+                <div></div>
+                <!-- <div class="btn" v-if="val.type == '组件服务'">技术文档</div> -->
              </div>
              <div class="ability-bottom">
                <div class="dec">资源描述：{{ val.description }}</div>
-                <div class="result">申请结果：{{ val.applyState }}</div>
+                <div class="result">
+                  申请结果：{{
+                    item.ended ? item.approveStatus || '审核完成' : '审核中'
+                  }}
+                </div>
              </div>
            </div>
          </div>
@ -156,6 +164,8 @@
        obj.name = key
        props.refObj.resourceApplication[key].map((item) => {
          obj.instanceId = item.instanceId
+          obj.ended = item.ended
+          obj.approveStatus = item.approveStatus
          if (item.resources.length > 0) {
            item.resources.map((val) => {
              obj.list.push(val)
--- a/front/src/views/personalCenter/components/ApplyDetails.vue
+++ b/front/src/views/personalCenter/components/ApplyDetails.vue
@ -273,11 +273,11 @@
  font-size: 16px;
 }
 :deep(.ant-table-tbody) > tr > .ant-table-cell:nth-child(5) {
-    width: 110px;
-    display: inline-block;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
+  // width: 110px;
+  // display: inline-block;
+  // white-space: nowrap;
+  // overflow: hidden;
+  // text-overflow: ellipsis;
 }
 .oddNumbers {
  margin-bottom: 0.05rem;
--- a/front/src/views/personalCenter/components/MyPublish.vue
+++ b/front/src/views/personalCenter/components/MyPublish.vue
@ -168,11 +168,13 @@
    </a-modal>
    <a-modal
      v-model:visible="visible"
-      title="下架原因"
+      width="12.1rem"
      @ok="del()"
      @cancel="reason = ''"
+      footer="{}"
    >
-      <a-input v-model:value="reason" placeholder="请输入下架原因" />
+      <TheShelvesAbility v-if="visible" :delObj="delObj"></TheShelvesAbility>
+      <!-- <a-input v-model:value="reason" placeholder="请输入下架原因" /> -->
    </a-modal>
    <a-modal
      v-model:visible="visible2"
@ -227,15 +229,17 @@
 </template>

 <script setup>
-  import { onMounted, reactive, ref } from 'vue'
+  import { onMounted, reactive, ref, onBeforeUnmount } from 'vue'
  import { useRouter } from 'vue-router'
  import { message } from 'ant-design-vue'
+  import mybus from '@/myplugins/mybus'
  // , reactive
  import { wodepage, undercarriage } from '@/api/personalCenter'
  import { getUserInfo } from '@/api/user'
  // TheNewRelease
  import TheNewRelease from '@/views/personalCenter/components/TheNewRelease'
  import PublishDetails from '@/views/personalCenter/components/PublishDetails'
+  import TheShelvesAbility from '@/views/personalCenter/components/TheShelvesAbility' //能力下架申请
  const router = useRouter()
  let tabList = ref([
    // '全部',
@ -324,7 +328,6 @@
  ])
  let tabname = ref('组件服务')
  function tabqiehuan(item, index) {
-    // debugger
    tabIndex.value = index
    switch (item) {
      case '组件服务':
@ -347,7 +350,6 @@
    }
  }
  function tabqiehuan2(item, index) {
-    // debugger
    if (index == tabIndex2.value) {
      tabIndex2.value = -1
      delFlag = ''
@ -441,7 +443,6 @@
    path: '/nenglishangjia', // 跳转的页面路由
  })
  // const nenglishangjia = () => {
-  //   // debugger
  //   window.open(newpage.href, '_blank')
  //   // router.resolve('/nenglishangjia')
  // }
@ -462,11 +463,30 @@
      ],
    }).then((res) => {
      console.log('下架结果', res)
+      if (res.data.data == '该资源已发起下架') {
+        message.error('该资源已发起下架,请耐心等待审批!')
+      } else {
+        message.success(`${delObj.value.name} 发起下架成功，请等待审批`)
+      }
      reason.value = ''
      visible.value = false
      getApplyList(tabname.value)
    })
  }
+  //退出申请按钮
+  mybus.on('Cancellation', (val) => {
+    visible.value = val
+  })
+  //提交申请按钮
+  mybus.on('Determine', (val) => {
+    delObj.value.name = val.title
+    reason.value = val.reason
+    del()
+  })
+  onBeforeUnmount(() => {
+    mybus.off('tabsChange')
+    mybus.off('Determine')
+  })
  const reason = ref('')
  const visible = ref(false)
  const delObj = ref({})
--- a/front/src/views/personalCenter/components/TheShelvesAbility.vue
+++ b/front/src/views/personalCenter/components/TheShelvesAbility.vue
@ -0,0 +1,475 @@
+<template>
+  <div class="TheShelvesAbility">
+    <div class="title-h1">能力下架申请</div>
+    <div class="title-h2">
+      <div class="title-left">下架能力</div>
+      <div class="title-right">展开</div>
+    </div>
+    <!-- 头部应用信息 -->
+    <div class="TheShelvesAbility-top">
+      <div class="deptName">
+        <span></span>
+        {{ name }}
+      </div>
+      <div class="data-list">
+        <div class="data-list-left"></div>
+        <div class="data-list-right">
+          <div class="data-list-right-titleAndDescription">
+            <div class="data-list-right-title">
+              <div class="title-left">
+                <span>{{ props.delObj.name }}</span>
+                <span>{{ props.delObj.type }}</span>
+              </div>
+              <div class="title-right">
+                <span>能力使用状态：</span>
+                <span v-if="dataList.total > 0">正在被使用</span>
+                <span v-else>未使用</span>
+              </div>
+            </div>
+            <div class="data-list-right-description">
+              {{ props.delObj.name }}：{{ props.delObj.description }}
+            </div>
+          </div>
+          <div class="data-list-right-table">
+            <div class="data-list-right-table-title">
+              正在使用应用数：{{ dataList.total }}
+            </div>
+            <div class="data-list-right-table-list">
+              <div class="data-list-right-table-list-tab">
+                <span
+                  v-for="(item, index) in datalistrighttablelist"
+                  :key="`data-list-right-table-list-tab-${index}`"
+                >
+                  {{ item }}
+                </span>
+              </div>
+              <div
+                class="data-list-right-table-list-content"
+                v-if="dataList.total > 0"
+              >
+                <div
+                  v-for="(item, index) in dataList.list"
+                  :key="`data-list-right-table-list-content-${index}`"
+                >
+                  <span>{{ item.applicationSystem }}</span>
+                  <span>{{ item.unit }}</span>
+                  <span>{{ item.user }}</span>
+                  <span>{{ item.phone }}</span>
+                </div>
+              </div>
+              <div v-else class="zanwu">暂无数据</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 底部用户基本信息 -->
+    <div class="TheShelvesAbility-bottom">
+      <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">
+          <a-form-item
+            label="申请标题"
+            name="title"
+            :rules="[{ required: true, message: '请输入申请标题' }]"
+          >
+            <a-input
+              placeholder="请输入能力申请标题"
+              v-model:value="formName.title"
+            />
+          </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>
+
+          <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
+            />
+          </a-form-item>
+        </div>
+        <a-form-item
+          style="color: #666; font-size: 16px"
+          label="申请单附件"
+          name="applyDoc"
+        >
+          <a-upload
+            v-model:file-list="formName.fileList"
+            name="file"
+            :action="`${baseURL}/upload`"
+            :headers="headers"
+            @change="handleChange"
+            :before-upload="beforeUpload"
+          >
+            <a-button
+              style="
+                width: 100px;
+                height: 30px;
+                margin-right: 10px;
+                background: #edf4fc;
+                color: #0087ff;
+                font-size: 14px;
+                border-radius: 6px;
+                border: 1px solid #bbd3ef;
+                padding: 0;
+                text-align: center;
+              "
+            >
+              <upload-outlined></upload-outlined>
+              文件上传
+            </a-button>
+            <span style="font-size: 14px; color: #999">
+              支持doc、docx、jpg、png、jpeg、pdf、xlxs、ppt类型文件
+            </span>
+          </a-upload>
+        </a-form-item>
+        <div>
+          <a-form-item
+            label="能力下架原因"
+            name="reason"
+            :rules="[{ required: true, message: '请输入能力下架原因' }]"
+          >
+            <a-input
+              placeholder="请输入能力下架原因"
+              v-model:value="formName.reason"
+            />
+          </a-form-item>
+        </div>
+        <div class="button-bottom">
+          <a-button
+            style="
+              width: 80px;
+              height: 38px;
+              margin-right: 20px;
+              background: #e1edfa;
+              color: #0087ff;
+              font-size: 14px;
+              border-radius: 6px;
+              border: none;
+              padding: 0;
+              text-align: center;
+            "
+            type="primary"
+            html-type="cancle"
+            @click="quxiao()"
+          >
+            退出申请
+          </a-button>
+          <a-button
+            style="
+              width: 80px;
+              height: 38px;
+              background: #0087ff;
+              color: #fff;
+              font-size: 14px;
+              border-radius: 6px;
+              border: none;
+              padding: 0;
+              text-align: center;
+            "
+            type="primary"
+            html-type="submit"
+            @click="queding()"
+          >
+            提交申请
+          </a-button>
+        </div>
+      </a-form>
+    </div>
+  </div>
+</template>
+
+<script setup>
+  import { ref, defineProps, watch } from 'vue'
+  import { message } from 'ant-design-vue'
+  import { deptIdQuery, AbilityToPullDownPages } from '@/api/personalCenter'
+  import { getUserInfo } from '@/api/user'
+  import mybus from '@/myplugins/mybus'
+  const baseURL = window.SITE_CONFIG.apiURL
+  const props = defineProps({
+    delObj: { type: Object, default: null },
+  })
+  let name = ref('')
+  const datalistrighttablelist = ref([
+    '赋能应用名称',
+    '应用归属部门',
+    '部门联系人',
+    '联系人电话',
+  ]) //初始化表头
+  let formName = ref({
+    title: '',
+    user: '',
+    phone: '',
+    unit: '',
+    reason: '',
+    fileList: [],
+  })
+  const dataList = ref({})
+  //初始化：获取部门名称
+  const dataFunction = () => {
+    let params = {
+      resourceId: props.delObj.id,
+    }
+    //初始化：获取部门名称
+    deptIdQuery(props.delObj.deptId).then((res) => {
+      name.value = res.data.data.name
+    })
+    //初始化：获取正在使用应用
+    AbilityToPullDownPages(params).then((res) => {
+      dataList.value = res.data.data
+    })
+    //初始化获取当前用户信息
+    getUserInfo().then((res) => {
+      formName.value.title = props.delObj.name
+      formName.value.user = res.data.data.realName
+      formName.value.phone = props.delObj.deptPhone
+      // formName.value.fileList = props.delObj.undercarriageEnclosure
+      deptIdQuery(res.data.data.deptId).then((resValue) => {
+        formName.value.unit = resValue.data.data.name
+      })
+    })
+    console.log('props.delObj', props.delObj)
+  }
+  watch(
+    () => props.delObj,
+    (val) => {
+      let params = {
+        resourceId: props.delObj.id,
+      }
+      deptIdQuery(props.delObj.deptId).then((res) => {
+        name.value = res.data.data.name
+      })
+      AbilityToPullDownPages(params).then((res) => {
+        dataList.value = res.data.data
+        console.log('props.delObj', props.delObj)
+      })
+      //初始化获取当前用户信息
+      getUserInfo().then((res) => {
+        formName.value.title = props.delObj.name
+        formName.value.user = res.data.data.realName
+        formName.value.phone = res.data.data.mobile
+        formName.value.fileList = props.delObj.undercarriageEnclosure
+        deptIdQuery(res.data.data.deptId).then((resValue) => {
+          formName.value.unit = resValue.data.data.name
+        })
+      })
+    },
+    { deep: true }
+  )
+  //取消按钮
+  const quxiao = () => {
+    mybus.emit('Cancellation', false)
+  }
+  //确定按钮
+  const queding = () => {
+    if (
+      formName.value.title == '' ||
+      formName.value.user == '' ||
+      formName.value.phone == '' ||
+      formName.value.unit == '' ||
+      formName.value.reason == ''
+    ) {
+      message.error('信息必填项请填写完整!')
+    } else {
+      // let dataFrom = props.delObj
+      // dataFrom.deptPhone = formName.value.phone
+      // dataFrom.name = formName.value.title
+      mybus.emit('Determine', formName.value)
+    }
+  }
+  //调用方法(调用的执行顺序)
+  const init = () => {
+    dataFunction()
+  }
+  init()
+</script>
+
+<style scoped lang="less">
+.TheShelvesAbility {
+  .title-h1 {
+    font-size: 0.22rem;
+    line-height: 0.22rem;
+    margin-bottom: 0.25rem;
+    color: #212121;
+  }
+  .title-h2 {
+    display: flex;
+    justify-content: space-between;
+    font-size: 0.16rem;
+    color: #212121;
+    line-height: 0.16rem;
+    border-bottom: 0.01rem #dddee1 solid;
+    margin: 0 0.6rem 0.2rem 0.6rem;
+    padding-bottom: 0.1rem;
+  }
+  .TheShelvesAbility-top {
+    margin: 0 0.6rem 0 0.6rem;
+    .deptName {
+      color: #0558e1;
+      font-size: 0.22rem;
+      display: flex;
+      align-items: center;
+      line-height: 0.22rem;
+      margin-bottom: 0.2rem;
+      span {
+        display: inline-block;
+        width: 0.05rem;
+        height: 0.05rem;
+        background: #0558e1;
+        border-radius: 0.05rem;
+        margin-right: 0.05rem;
+      }
+    }
+    .data-list {
+      display: flex;
+      border-bottom: 1px solid #dddee1;
+      margin-bottom: 0.1rem;
+      .data-list-left {
+        width: 0.8rem;
+        height: 1.1rem;
+        background: url('~@/assets/personalCenter/Capabilitydiagram.png')
+          no-repeat;
+        background-size: 0.8rem 0.8rem;
+        background-position: center;
+        margin-left: 0.1rem;
+        padding-bottom: 0.3rem;
+      }
+      .data-list-right {
+        width: calc(100% - 0.83rem);
+        margin-left: 0.1rem;
+        padding-bottom: 0.2rem;
+        border-left: 1px solid #dddee1;
+        font-size: 0.18rem;
+        color: #000000;
+        .data-list-right-titleAndDescription {
+          padding-left: 0.1rem;
+          padding-right: 0.2rem;
+          border-bottom: 1px solid #dddee1;
+          padding-bottom: 0.1rem;
+          .data-list-right-title {
+            display: flex;
+            justify-content: space-between;
+            margin-bottom: 0.2rem;
+            .title-left {
+              span:first-child {
+                font-weight: 600;
+              }
+              span:last-child {
+                font-size: 0.14rem;
+                display: inline-block;
+                margin-left: 0.08rem;
+                padding: 0 0.05rem;
+                border-radius: 0.3rem;
+                background: #00b8e6;
+                color: #fff;
+              }
+            }
+          }
+        }
+        .data-list-right-table {
+          .data-list-right-table-title {
+            margin-left: 0.1rem;
+            margin-top: 0.2rem;
+            margin-bottom: 0.2rem;
+            font-size: 0.14rem;
+            display: inline-block;
+            margin-left: 0.08rem;
+            padding: 0 0.05rem;
+            border-radius: 0.3rem;
+            background: #00b8e6;
+            color: #fff;
+          }
+          .data-list-right-table-list {
+            padding: 0 0.05rem;
+            .data-list-right-table-list-tab {
+              display: grid;
+              grid-template-columns: repeat(4, 25%);
+              background: rgba(191, 191, 191, 0.1);
+              span {
+                display: inline-block;
+                text-align: center;
+                padding: 0.05rem 0;
+              }
+            }
+            .data-list-right-table-list-content {
+              & > div {
+                display: grid;
+                grid-template-columns: repeat(4, 25%);
+                span {
+                  display: inline-block;
+                  text-align: center;
+                  padding: 0.05rem 0;
+                }
+              }
+              div:nth-child(even) {
+                background: rgba(191, 191, 191, 0.1);
+              }
+              div:nth-child(odd) {
+                span {
+                  padding: 0.2rem 0;
+                }
+              }
+            }
+            .zanwu {
+              margin-top: 0.2rem;
+              text-align: center;
+            }
+          }
+        }
+      }
+    }
+  }
+  .TheShelvesAbility-bottom {
+    margin: 0.5rem 0.6rem 0 0.6rem;
+    .base-info {
+      display: flex;
+      justify-content: space-between;
+    }
+    .button-bottom {
+      display: flex;
+      justify-content: center;
+    }
+  }
+}
+</style>
--- a/front/src/views/personalCenter/components/addApplication.vue
+++ b/front/src/views/personalCenter/components/addApplication.vue
@ -329,7 +329,7 @@
      }

      const fileList = ref([])
-
+      const subimtFlag = ref(true)
      const processStartHandle = () => {
        if (id.value) {
          updateDemandForm(formName).then((upres) => {
@ -350,15 +350,19 @@
            }
          })
        } else {
+          if (subimtFlag.value) {
+            subimtFlag.value = false
            formRef.value.validate().then(() => {
              demandApply(formName).then((res) => {
                applySuccess.value = false
                message.success('操作成功！')
                console.log('能力申请================>', res)
+                subimtFlag.value = true
              })
            })
          }
        }
+      }

      return {
        formRef,
Author	SHA1	Message	Date
wuhongjian	b1543e323a	合并版本v0.8.2.6	2022-07-21 18:17:37 +08:00
gaoyuanwei	0aa074e36f	Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev	2022-07-21 18:02:43 +08:00
gaoyuanwei	6d318b57b2	需求申请报错修改	2022-07-21 18:00:49 +08:00
a0049873	1bdd5c6a1c	BUG修改	2022-07-21 17:58:13 +08:00
gaoyuanwei	0562c702fe	627bug	2022-07-21 17:20:43 +08:00
gaoyuanwei	12f0bdc814	Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev	2022-07-21 17:13:55 +08:00
gaoyuanwei	3a34e97ec8	bug	2022-07-21 17:13:39 +08:00
a0049873	2cc2cc4e00	BUG修改以及消息中心自动刷新	2022-07-21 17:10:13 +08:00
851673013@qq.com	3f24f6feed	后台能力下架审批	2022-07-21 16:45:00 +08:00
a0049873	d3174f8cb0	驳回改成终止	2022-07-21 16:41:46 +08:00
a0049873	f3499c31b0	BUG修改	2022-07-21 16:20:09 +08:00
gaoyuanwei	2c95fa65af	tota	2022-07-21 16:06:45 +08:00
gaoyuanwei	3968d6a7de	bug	2022-07-21 15:57:08 +08:00
a0049873	681dceaa47	BUG修改	2022-07-21 15:36:01 +08:00
a0049873	10f3323676	消息中心添加 websocket	2022-07-21 14:34:09 +08:00
851673013@qq.com	66e479ed5f	关闭弹窗bug	2022-07-21 13:52:30 +08:00
851673013@qq.com	c0831d1eea	应用资源归属部门	2022-07-21 11:39:09 +08:00
851673013@qq.com	722f0b970a	能力下架申请	2022-07-21 11:29:15 +08:00
gaoyuanwei	dbe688f3aa	Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev	2022-07-21 11:26:59 +08:00
gaoyuanwei	2be53d5e28	applicationSystem[]变''	2022-07-21 11:26:47 +08:00
a0049873	f62af22a5e	样式修改	2022-07-21 10:56:54 +08:00
a0049873	d5bb315312	Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev	2022-07-21 10:37:33 +08:00
a0049873	599250db0d	BUG修改	2022-07-21 10:37:26 +08:00
gaoyuanwei	c687738e2c	同意跳转	2022-07-21 10:09:46 +08:00
gaoyuanwei	a044ead9b0	Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev	2022-07-21 10:00:38 +08:00
gaoyuanwei	eadcfdceaf	购物车返回第一页bug	2022-07-21 09:59:17 +08:00
a0049873	578c941f1c	按钮修改	2022-07-21 09:57:47 +08:00
851673013@qq.com	30afa74344	前台上架下一页	2022-07-21 09:15:05 +08:00
wuhongjian	38c77a3e96	西海岸直接回单点	2022-07-20 17:22:23 +08:00
gaoyuanwei	66a5d33609	眼花了，没有png	2022-07-20 16:21:28 +08:00
gaoyuanwei	b2d51e12eb	技术文档提示---高级搜索条件编辑---基础设施dec不要	2022-07-20 16:18:18 +08:00
gaoyuanwei	2330dd5680	组件服务-挂载	2022-07-20 15:06:57 +08:00
gaoyuanwei	29a5016590	组件服务-挂接	2022-07-20 15:04:52 +08:00