合并

2022-07-22 16:09:16 +08:00 · 2022-07-22 16:09:16 +08:00 · 2bcc93b0d6
parent f52cbac587 5876a3488e
commit 2bcc93b0d6
30 changed files with 1338 additions and 613 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/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@ -46,12 +46,11 @@
      </el-form>
      <el-table
        v-loading="dataListLoading"
-        v-if="dataList[0].infoList"
        :data="dataList"
-        :height="qp ? '650px' : '650px'"
        border
        @selection-change="dataListSelectionChangeHandle"
        style="width: 100%"
+        :height="qp ? '650px' : '650px'"
      >
        <el-table-column
          type="selection"
@ -75,6 +74,7 @@
          header-align="center"
          align="center"
        ></af-table-column>
+        <template v-if="dataList[0] && dataList[0].infoList">
        <af-table-column
          :show-overflow-tooltip="true"
          width="300"
@ -88,6 +88,7 @@
            {{ findValue(scope.row.infoList, item.attrType) }}
          </template>
        </af-table-column>
+        </template>
        <el-table-column
          :label="$t('handle')"
          fixed="right"
--- a/back/src/views/modules/ability/bsabilityservice.vue
+++ b/back/src/views/modules/ability/bsabilityservice.vue
@ -66,7 +66,7 @@
          header-align="center"
          align="center"
        ></el-table-column>
-
+        <template v-if="dataList[0] && dataList[0].infoList">
          <el-table-column
            v-for="(item, index) in dataList[0].infoList"
            :key="index"
@ -79,6 +79,7 @@
              {{ findValue(scope.row.infoList, item.attrType) }}
            </template>
          </el-table-column>
+        </template>
        <el-table-column
          :label="$t('handle')"
          fixed="right"
--- a/back/src/views/modules/activiti/demo/putaway-process3.vue
+++ b/back/src/views/modules/activiti/demo/putaway-process3.vue
@ -0,0 +1,530 @@
+<!-- 能力下架审批 -->
+<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" v-if="this.dataForm.taskId">
+      <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.dataForm.taskId = this.$route.params.taskId
+    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
@ -33,11 +33,13 @@
      ref="renProcessMultiple"
    ></ren-process-multiple> -->
    <!-- 审批 -->
-    <div class="agreeOr">
+    <div class="agreeOr" v-if="taskId">
      <h3>审批</h3>
      <div>
        <el-button type="primary" @click="showDialog('同意')">同意</el-button>
-        <el-button  type="danger" plain @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>
@ -59,15 +61,22 @@
        > -->
      </div>
    </div>
+    <!--  流程详情   -->
+    <ren-process-detail></ren-process-detail>
    <el-dialog
      title="审批意见"
      :visible.sync="dialogVisible"
      width="30%"
-      :before-close="handleClose">
+      :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="agreeOrNot()">确 定</el-button>
+        <el-button
+          type="primary"
+          @click.native="agreeOrNot($store.state.contentTabsActiveName)"
+          >确 定</el-button
+        >
      </span>
    </el-dialog>
  </div>
@ -120,6 +129,7 @@ export default {
    // 将业务KEY赋值给表单
    console.log('params=================>', this.$route, this.$route.params)
    this.taskId = this.$route.params.taskId
+    this.dataForm.taskId = this.$route.params.taskId
    this.init()
    console.log('fromList', this.$router.currentRoute.params.businessKey)
    // this.dataForm = this.$router.currentRoute.params.params.params.resourceDTO
@ -157,11 +167,11 @@ export default {
    },
    handleClose (done) {
      this.$confirm('确认关闭？')
-        .then(_ => {
+        .then((_) => {
          this.input = ''
          done()
        })
-        .catch(_ => {})
+        .catch((_) => {})
    },
    handleClose2 () {
      this.dialogVisible = false
@ -185,15 +195,18 @@ export default {
      })
    },
    // 同意与退回
-    agreeOrNot: debounce(function () {
+    agreeOrNot: debounce(
+      function (data) {
        if (this.dialogType === '同意') {
          console.log('this.dataForm', this.dataForm)
          const params = qs.stringify({
-          taskId: this.dataForm.taskId,
+            taskId: this.taskId,
            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) {
@ -207,18 +220,23 @@ export default {
                duration: 500,
                onClose: () => {
                  this.visible = false
+                  this.dialogVisible = false
+                  this.input = ''
                  if (this.callbacks.taskHandleSuccessCallback) {
                    this.callbacks.taskHandleSuccessCallback(res)
                  }
                }
              })
-        }).catch(() => {})
+            })
+            .catch(() => {})
        } else if (this.dialogType === '拒绝') {
          const params = qs.stringify({
-          taskId: this.dataForm.taskId,
+            taskId: this.taskId,
            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) {
@ -239,7 +257,11 @@ export default {
              })
            })
        }
-    }, 1000, { leading: true, trailing: false }),
+        this.tabRemoveHandle(data)
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
    tabRemoveHandle (tabName) {
      console.log(tabName, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
      if (tabName === 'home') {
--- 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-21 10:35:13
+ * @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>
@ -58,7 +86,7 @@
    ></ren-process-multiple> -->

    <!-- 审批 -->
-    <div class="agreeOr">
+    <div class="agreeOr" v-if="dataForm.taskId">
      <h3>审批</h3>
      <div>
        <!-- <el-radio-group v-model="agreeOrList" style="width:230px;">
@ -66,7 +94,9 @@
          <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-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> -->
@ -79,11 +109,16 @@
      title="审批意见"
      :visible.sync="dialogVisible"
      width="30%"
-      :before-close="handleClose">
+      :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>
+        <el-button
+          type="primary"
+          @click.native="agreeOrNot($store.state.contentTabsActiveName)"
+          >确 定</el-button
+        >
      </span>
    </el-dialog>
  </el-card>
@ -132,6 +167,7 @@ export default {
    // 将业务KEY赋值给表单
    console.log('params=================>', this.$route, this.$route.params)
    this.dataForm.taskId = this.$route.params.taskId
+    this.dataForm.instanceId = this.$route.params.processInstanceId
    this.init()
    // // 流程回调
    var callbacks = {
@ -165,10 +201,10 @@ export default {
      // this.visible = true
      this.$nextTick(() => {
        // this.$refs.dataForm.resetFields()
+        this.getInfo()
        if (this.dataForm.taskId) {
          // 如业务KEY已存在，不允许编辑
          // this.fieldDisabled = true
-          this.getInfo()
          console.log(this.dataForm, 'init')
        }
      })
@ -179,11 +215,11 @@ export default {
    },
    handleClose (done) {
      this.$confirm('确认关闭？')
-        .then(_ => {
+        .then((_) => {
          this.input = ''
          done()
        })
-        .catch(_ => {})
+        .catch((_) => {})
    },
    handleClose2 () {
      this.dialogVisible = false
@ -199,22 +235,40 @@ export default {
    },
    // 获取信息
    getInfo () {
+      let params = ''
+      if (this.dataForm.taskId) {
+        params = `taskId=${this.dataForm.taskId}`
        this.$http
-        .get(`/act/task/getTaskVariables?taskId=${this.dataForm.taskId}&variableName=tAbilityApplicationDTOList`)
+          .get(
+            `/act/task/getTaskVariables?${params}&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 = {
@ -223,12 +277,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,
@ -243,6 +297,59 @@ export default {
            }
          })
          .catch(() => {})
+      } else {
+        params = `instanceId=${this.dataForm.instanceId}`
+        this.$http
+          .get(
+            `/act/his/getVariablesByInstanceId?${params}&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============================'
+            )
+            if (res.data[0].applicationScene) {
+              res.data[0].applicationSceneStr = ''
+              res.data[0].applicationScene.map((val, index) => {
+                res.data[0].applicationSceneStr += val
+                if (index < res.data[0].applicationScene.length - 1) {
+                  res.data[0].applicationSceneStr += '、'
+                }
+              })
+            }
+            this.dataForm.content = res.data[0]
+            const obj = {
+              name: '申请摄像头列表',
+              type: '基础设施',
+              describe: ''
+            }
+            let flag = false
+            res.data.tAbilityApplicationDTOList.map((val) => {
+              if (val.cameraList) {
+                flag = true
+                obj.describe += val.system
+              } else {
+                this.$http.get('/resource/' + val.resourceId).then((res1) => {
+                  // console.log(res1.data.data, '1111111111111111111111111111111111')
+                  this.dataList.push({
+                    name: res1.data.data.name,
+                    type: res1.data.data.type,
+                    describe: res1.data.data.description
+                  })
+                })
+              }
+            })
+            if (flag) {
+              this.dataList.push(obj)
+            }
+          })
+          .catch(() => {})
+      }
    },
    // 申请能力
    applyData () {
@ -260,7 +367,8 @@ export default {
        .catch(() => {})
    },
    // 同意与退回
-    agreeOrNot: debounce(function (data) {
+    agreeOrNot: debounce(
+      function (data) {
        if (this.dialogType === '同意') {
          console.log('this.dataForm', this.dataForm)
          const params = qs.stringify({
@ -268,7 +376,9 @@ export default {
            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) {
@ -282,18 +392,22 @@ export default {
                duration: 500,
                onClose: () => {
                  this.visible = false
+                  this.dialogVisible = false
                  if (this.callbacks.taskHandleSuccessCallback) {
                    this.callbacks.taskHandleSuccessCallback(res)
                  }
                }
              })
-        }).catch(() => {})
+            })
+            .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 }) => {
+          this.$http
+            .post('/act/task/endProcess?', params)
+            .then(({ data: res }) => {
              if (res.code !== 0) {
                this.$message.error(res.msg)
                if (this.callbacks.taskHandleErrorCallback) {
@ -316,7 +430,10 @@ export default {
        }
        this.tabRemoveHandle(data)
        // this.getDataList(data)
-    }, 1000, { leading: true, trailing: false }),
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
    tabRemoveHandle (tabName) {
      console.log(tabName, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
      if (tabName === 'home') {
@ -450,7 +567,7 @@ export default {
    }
    .clearfix:after {
      display: block;
-      content: "";
+      content: '';
      clear: both;
    }
    .title {
@ -460,7 +577,7 @@ export default {
      border-bottom: 0;
    }
    .title:before {
-      content: "";
+      content: '';
      width: 6px;
      height: 6px;
      display: inline-block;
--- a/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
+++ b/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
@ -199,7 +199,7 @@ export default {
 <style lang='scss' scoped>
 #inputSelectCheckbox {
  // margin-top: 20px;
-  width: 100%;
+  width: calc(100% - 105px);
  display: flex;
  justify-content: flex-start;
  align-items: center;
--- a/back/src/views/modules/putOnTheShelf/components/special.vue
+++ b/back/src/views/modules/putOnTheShelf/components/special.vue
@ -42,6 +42,7 @@
              <a-input
                v-model:value="val.note1"
                :placeholder="'请填写' + val.name"
+                style="width: calc(100% - 150px);"
              />
              <span style="width: 2.5rem; padding-left: 0.1rem">
                {{
@ -253,7 +254,7 @@ export default {
    align-items: center;

    span:first-child {
-      width: 120px;
+      width: 105px;
    }

    :deep(.ant-input-textarea) {
@ -268,7 +269,7 @@ export default {
      width: 200px;
    }

-    :deep(.ant-input) {
+    ::v-deep .ant-input {
      resize: none;
      width: 570px;
    }
--- 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.liangjunhua
- * @LastEditTime: 2022-07-18 17:42:59
+ * @LastEditTime: 2022-07-21 15:09:22
 * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@ -47,10 +47,10 @@
    // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
    // 开发
    window.SITE_CONFIG['backUrl'] = 'http://localhost:8001';
-    window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
-    window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
-    // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
-    window.SITE_CONFIG['apiURL'] = 'http://10.18.1.99:8889/renren-admin';
+    window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.236:9796/';
+    window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.236:9796/document/#/devModelFile/';
+    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin';
+    window.SITE_CONFIG['websocketURL'] = '15.2.21.236:8888/renren-admin';
    window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
    // 穿透版本
    // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
--- 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/main.js
+++ b/front/src/main.js
@ -1,8 +1,8 @@
 /*
 * @Author: hisense.wuhongjian
 * @Date: 2022-03-29 17:48:03
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-07 09:22:56
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-21 18:39:03
 * @Description: 告诉大家这是什么
 */
 import { createApp } from 'vue'
@ -25,10 +25,10 @@ import * as ElementPlusIconsVue from '@element-plus/icons-vue'
 * @author chuzhixin 1204505056@qq.com
 * @description 正式环境默认使用mock，正式项目记得注释后再打包
 */
-if (process.env.NODE_ENV === 'production') {
-  const { mockXHR } = require('@/utils/static')
-  mockXHR()
-}
+// if (process.env.NODE_ENV === 'production') {
+//   const { mockXHR } = require('@/utils/static')
+//   mockXHR()
+// }
 const emitter = mitt()
 const app = createApp(App)
 app.config.globalProperties.$emitter = emitter
--- a/front/src/views/capacityOnTheShelf/Application.vue
+++ b/front/src/views/capacityOnTheShelf/Application.vue
@ -56,6 +56,7 @@
        @back="back()"
      ></put-on-the-shelf>
      <put-on-the-shelf
+        ref="refPutOnTheShelf"
        v-else-if="showView === '部署与应用'"
        :refData="refData"
        :dataFrom="dataFrom"
--- a/front/src/views/capacityOnTheShelf/LayerServices.vue
+++ b/front/src/views/capacityOnTheShelf/LayerServices.vue
@ -129,7 +129,9 @@
      <a-popconfirm
        v-if="
          showView === '部署与使用' &&
-          bs[0].list.filter((val) => val.note1 !== '').length > 0
+          bs[0].list.filter(
+            (val) => val.note1 !== '' && val.name !== '计费方式'
+          ).length > 0
        "
        title="如果常见问题未填写完整将会被丢弃，是否进行提交?"
        ok-text="是"
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue
@ -173,16 +173,7 @@
  })
  const flag = ref(true)
  if (props.dataList.infoList) {
-    let obj = props.dataList.infoList.filter(
-      (item) =>
-        item.attrType === '技术文档' ||
-        item.attrType === '服务商' ||
-        item.attrType === '服务商联系人' ||
-        item.attrType === '使用手册' ||
-        item.attrType === '服务接口' ||
-        item.attrType === '样式服务地址' ||
-        item.attrType === '服务商联系电话'
-    )[0]
+    let obj = true
    if (!obj) {
      flag.value = false
    } else {
@ -218,16 +209,7 @@
    () => props.dataList,
    (val) => {
      if (val) {
-        let obj = val.infoList.filter(
-          (item) =>
-            item.attrType === '技术文档' ||
-            item.attrType === '服务商' ||
-            item.attrType === '服务商联系人' ||
-            item.attrType === '使用手册' ||
-            item.attrType === '服务接口' ||
-            item.attrType === '样式服务地址' ||
-            item.attrType === '服务商联系电话'
-        )[0]
+        let obj = true
        if (!obj) {
          flag.value = false
        } else {
--- a/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue
@ -94,10 +94,6 @@
            dataFrom.value.content[1].childrenContent[2].attrValue = '------'
          }
        }
-      } else if (item.attrType === '部门联系人') {
-        deptContacts.attrValue = item.attrValue || '------'
-      } else if (item.attrType === '部门联系人电话') {
-        deptPhone.attrValue = item.attrValue || '------'
      }
    })

--- 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.liangjunhua
- * @LastEditTime: 2022-07-19 15:02:23
+ * @LastEditTime: 2022-07-21 16:18:54
 * @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
@ -124,16 +124,7 @@
  })
  const flag = ref(true)
  if (props.dataList.infoList) {
-    let obj = props.dataList.infoList.filter(
-      (item) =>
-        item.attrType === '技术文档' ||
-        item.attrType === '服务商' ||
-        item.attrType === '服务商联系人' ||
-        item.attrType === '使用手册' ||
-        item.attrType === '服务地址' ||
-        item.attrType === '样式服务地址' ||
-        item.attrType === '服务商联系电话'
-    )[0]
+    let obj = true
    if (!obj) {
      flag.value = false
    } else {
@ -162,16 +153,7 @@
    () => props.dataList,
    (val) => {
      if (val) {
-        let obj = val.infoList.filter(
-          (item) =>
-            item.attrType === '技术文档' ||
-            item.attrType === '服务商' ||
-            item.attrType === '服务商联系人' ||
-            item.attrType === '使用手册' ||
-            item.attrType === '服务地址' ||
-            item.attrType === '样式服务地址' ||
-            item.attrType === '服务商联系电话'
-        )[0]
+        let obj = true
        if (!obj) {
          flag.value = false
        } else {
--- 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/detailsAll/components/LayerService/LayerServiceUsageMode.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
@ -128,16 +128,7 @@
  })
  const flag = ref(true)
  if (props.dataList.infoList) {
-    let obj = props.dataList.infoList.filter(
-      (item) =>
-        item.attrType === '技术文档' ||
-        item.attrType === '服务商' ||
-        item.attrType === '服务商联系人' ||
-        item.attrType === '使用手册' ||
-        item.attrType === '服务地址' ||
-        item.attrType === '样式服务地址' ||
-        item.attrType === '服务商联系电话'
-    )[0]
+    let obj = true
    if (!obj) {
      flag.value = false
    } else {
@ -168,16 +159,7 @@
    () => props.dataList,
    (val) => {
      if (val) {
-        let obj = val.infoList.filter(
-          (item) =>
-            item.attrType === '技术文档' ||
-            item.attrType === '服务商' ||
-            item.attrType === '服务商联系人' ||
-            item.attrType === '使用手册' ||
-            item.attrType === '服务地址' ||
-            item.attrType === '样式服务地址' ||
-            item.attrType === '服务商联系电话'
-        )[0]
+        let obj = true
        if (!obj) {
          flag.value = false
        } else {
--- a/front/src/views/developmentGuide/index.vue
+++ b/front/src/views/developmentGuide/index.vue
@ -5,7 +5,7 @@
      <div class="banner"></div>
      <main>
        <div class="top">
-          <h1>开发指南</h1>
+          <h1>技术文档</h1>
          <a-input-search
            v-model:value="searchValue"
            placeholder="请输入关键词"
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@ -944,9 +944,23 @@
      const resourceList = reactive({ data: [] })
      const videoList = reactive({ data: [] })
      const resourceTotal = ref('')
+      // 校验
+      const re = /^[0-9\u4E00-\u9FA5]*$/
      const getAppResources = (switchIndex) => {
-        if (switchIndex) {
-          if (switchIndex.length > 1) {
+        if (searchValue.value) {
+          let str = ''
+          let r = null
+          console.log(
+            '2222222222222222222222222222',
+            searchValue.value,
+            searchValue.value.length
+          )
+          if (searchValue.value.length >= 2) {
+            str = searchValue.value.substring(0, 2)
+            console.log('str================>', str)
+            r = re.test(str)
+          }
+          if (searchValue.value.length > 1 && r) {
            //switchIndex这个参数是下面的分页传过来的参数
            paramsGetResources.name = searchValue.value
            paramsGetResources.type = Cardsname.value
@ -1025,7 +1039,7 @@
              })
            }
          } else {
-            message.error('请输入一个字以上！')
+            message.error('请以两位以上汉字或数字开头')
          }
        } else {
          //switchIndex这个参数是下面的分页传过来的参数
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@ -462,6 +462,13 @@
                            })
                          }
                        })
+                      } else {
+                        router.push({
+                          path: '/DetailsPageconetent',
+                          query: {
+                            select: '组件服务',
+                          },
+                        })
                      }
                    })
                  }
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@ -284,6 +284,8 @@
  //     getMynotice()
  //   })
  // }
+  // 建立链接 -- 携带cookie参数
+
  onMounted(() => {
    getSgcTotal().then((res) => {
      // console.log('初始化========================>', res.data.data.count)
--- 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/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/TheShelvesAbility.vue
+++ b/front/src/views/personalCenter/components/TheShelvesAbility.vue
@ -22,7 +22,7 @@
              </div>
              <div class="title-right">
                <span>能力使用状态：</span>
-                <span v-if="dataList.tota > 0">正在被使用</span>
+                <span v-if="dataList.total > 0">正在被使用</span>
                <span v-else>未使用</span>
              </div>
            </div>
@ -45,7 +45,7 @@
              </div>
              <div
                class="data-list-right-table-list-content"
-                v-if="dataList.tota > 0"
+                v-if="dataList.total > 0"
              >
                <div
                  v-for="(item, index) in dataList.list"
--- 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,22 @@
            }
          })
        } else {
+          if (subimtFlag.value) {
+            subimtFlag.value = false
            formRef.value.validate().then(() => {
+              const detString = String(formName.detailsField)
+              formName.detailsField = detString
+              console.log(detString, formName.detailsField, 'detString')
              demandApply(formName).then((res) => {
                applySuccess.value = false
                message.success('操作成功！')
                console.log('能力申请================>', res)
+                subimtFlag.value = true
              })
            })
          }
        }
+      }

      return {
        formRef,