From 38bc627486562ec88d63bb8b43a044ceae84e366 Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Wed, 13 Jul 2022 11:18:02 +0800
Subject: [PATCH] =?UTF-8?q?merge=20change=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../myAgent/demo/Application-resources.vue    |  22 +++
 .../myAgent/demo/ability-resource-shelf.vue   | 150 +-----------------
 front/public/static/config/location.js        |   8 +-
 front/src/api/personalCenter.js               |   7 +
 front/src/utils/accessToken.js                |   6 +-
 front/src/views/capabilityCloud/index.vue     |   7 +-
 .../capacityOnTheShelf/BusinessComponent.vue  |   4 +-
 .../ApplicationDeploymentAndSecurity.vue      |  16 +-
 front/src/views/home/Navigation.vue           |   2 +-
 .../home/components/searchResultList.vue      |   4 -
 10 files changed, 49 insertions(+), 177 deletions(-)
 create mode 100644 back/src/views/modules/myAgent/demo/Application-resources.vue

diff --git a/back/src/views/modules/myAgent/demo/Application-resources.vue b/back/src/views/modules/myAgent/demo/Application-resources.vue
new file mode 100644
index 00000000..bf310a87
--- /dev/null
+++ b/back/src/views/modules/myAgent/demo/Application-resources.vue
@@ -0,0 +1,22 @@
+<template>
+  <div class="wrapper"></div>
+</template>
+
+<script>
+export default {
+  components: {},
+  props: {},
+  data () {
+    return {}
+  },
+  watch: {},
+  computed: {},
+  methods: {},
+  created () {},
+  mounted () {}
+}
+</script>
+<style lang="scss" scoped>
+.wrapper {
+}
+</style>
diff --git a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
index 5681064c..9581bda4 100644
--- a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
+++ b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
@@ -8,150 +8,9 @@
         :label-width="$i18n.locale === 'en-US' ? '120px' : 'auto'"
       >
         <div v-if="shifoushizujian">
-          <el-form-item label="应用名称">
-            <el-input
-              v-model="dataForm.name"
-              :disabled="fieldDisabled"
-              placeholder="应用名称"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="应用描述">
-            <el-tooltip
-              effect="dark"
-              :content="dataForm.description"
-              placement="top"
-              popper-class="kuandukuandukuandu"
-            >
-              <el-input
-                v-model="dataForm.description"
-                :disabled="fieldDisabled"
-                placeholder="应用描述"
-              ></el-input>
-            </el-tooltip>
-          </el-form-item>
-          <el-form-item label="部门联系人">
-            <el-input
-              v-model="dataForm.deptContacts"
-              :disabled="fieldDisabled"
-              placeholder="部门联系人"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="共享类型">
-            <el-input
-              v-model="dataForm.shareType"
-              :disabled="fieldDisabled"
-              placeholder="共享类型"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="共享方式">
-            <el-input
-              v-model="dataForm.shareMode"
-              :disabled="fieldDisabled"
-              placeholder="共享方式"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="共享条件">
-            <el-input
-              v-model="dataForm.shareCondition"
-              :disabled="fieldDisabled"
-              placeholder="共享方条件"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="访问地址">
-            <el-input
-              v-model="dataForm.link"
-              :disabled="fieldDisabled"
-              placeholder="访问地址"
-            ></el-input>
-          </el-form-item>
+          <Applicationresources></Applicationresources>
         </div>
-        <div v-if="!shifoushizujian">
-          <el-form-item label="组件名称" v-if="algorithmShow">
-            <el-input
-              v-model="dataForm.name"
-              :disabled="fieldDisabled"
-              placeholder="组件名称"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="算法名称" v-if="nameNotShow">
-            <el-input
-              v-model="dataForm.name"
-              :disabled="fieldDisabled"
-              placeholder="算法名称"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="应用描述" v-if="algorithmShow">
-            <el-input
-              v-model="dataForm.description"
-              :disabled="fieldDisabled"
-              placeholder="应用描述"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="算法描述" v-if="nameNotShow">
-            <el-input
-              v-model="dataForm.description"
-              :disabled="fieldDisabled"
-              placeholder="算法描述"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="部门联系人" v-if="algorithmShow">
-            <el-input
-              v-model="dataForm.deptContacts"
-              :disabled="fieldDisabled"
-              placeholder="部门联系人"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="共享类型">
-            <el-input
-              v-model="dataForm.shareType"
-              :disabled="fieldDisabled"
-              placeholder="共享类型"
-            ></el-input>
-          </el-form-item>
-          <el-form-item
-            label="共享方式"
-            v-if="coverageNotShow && algorithmShow"
-          >
-            <el-input
-              v-model="dataForm.shareMode"
-              :disabled="fieldDisabled"
-              placeholder="共享方式"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="共享条件">
-            <el-input
-              v-model="dataForm.shareCondition"
-              :disabled="fieldDisabled"
-              placeholder="共享方条件"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="服务接口" v-if="coverageNotShow">
-            <el-input
-              v-model="dataForm.apiUrl"
-              :disabled="fieldDisabled"
-              placeholder="服务接口"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="接口请求方式" v-if="coverageNotShow">
-            <el-input
-              v-model="dataForm.apiMethodType"
-              :disabled="fieldDisabled"
-              placeholder="接口请求方式"
-            ></el-input>
-          </el-form-item>
-        </div>
-        <el-form-item
-          v-for="item in dataForm.infoList"
-          :key="item.index"
-          :label="item.attrType"
-          :disabled="fieldDisabled"
-        >
-          <el-input
-            v-model="item.attrValue"
-            :placeholder="item.attrType"
-            :disabled="fieldDisabled"
-          ></el-input>
-        </el-form-item>
+        <div v-if="!shifoushizujian">22222</div>
         <el-form-item
           v-if="dataForm.enclosure"
           label="申请附件"
@@ -176,10 +35,13 @@
 
 <script>
 import processModule from '@/mixins/process-module'
+import Applicationresources from './Application-resources.vue'
 export default {
   // 注入公共方法
   mixins: [processModule],
-  components: {},
+  components: {
+    Applicationresources
+  },
   props: {
     // fromList: {
     //   // type: Array,
diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js
index b01757d1..763b690a 100644
--- a/front/public/static/config/location.js
+++ b/front/public/static/config/location.js
@@ -1,11 +1,11 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-12 14:55:46
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-07-08 08:53:41
  * @Description: 数据资源参数配置
  */
- const newLocation = 'qingdao'
+const newLocation = 'qingdao'
 // const newLocation = 'baotou'
 //  const newLocation = 'xihaian'
 
@@ -163,7 +163,7 @@ else if (newLocation === 'xihaian') {
   footerDataList.footerList = {
     company: {
       left: '青岛西海岸新区大数据发展促进局建设',
-      right: 'v0.8.1.6',
+      right: 'v0.8.1.5',
     },
     address: [
       {
diff --git a/front/src/api/personalCenter.js b/front/src/api/personalCenter.js
index 892ff59d..d9eb8e9b 100644
--- a/front/src/api/personalCenter.js
+++ b/front/src/api/personalCenter.js
@@ -7,6 +7,13 @@ export function getMyProcessInstancePage(params) {
     params,
   })
 }
+export function getTabilityapplication(params) {
+  return request({
+    url: '/processForm/tabilityapplication/my_page',
+    method: 'get',
+    params,
+  })
+}
 
 // 查询申购车列表
 export function getSgcList(params) {
diff --git a/front/src/utils/accessToken.js b/front/src/utils/accessToken.js
index 4e813704..343f3587 100644
--- a/front/src/utils/accessToken.js
+++ b/front/src/utils/accessToken.js
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-03-29 17:48:03
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-09 16:47:54
+ * @LastEditTime: 2022-04-25 17:47:09
  * @Description: 告诉大家这是什么
  */
 import { storage, tokenTableName } from '@/config'
@@ -33,7 +33,7 @@ export function getAccessToken() {
  * @author chuzhixin 1204505056@qq.com
  * @description 存储accessToken
  * @param accessToken
- * @returns {void|*}cs
+ * @returns {void|*}
  */
 export function setAccessToken(accessToken) {
   if (storage) {
@@ -64,7 +64,7 @@ export function removeAccessToken() {
     } else if ('sessionStorage' === storage) {
       return sessionStorage.clear()
     } else if ('cookie' === storage) {
-      return cookie.remove(tokenTableName)
+      // return cookie.remove(tokenTableName)
     } else {
       return localStorage.removeItem(tokenTableName)
     }
diff --git a/front/src/views/capabilityCloud/index.vue b/front/src/views/capabilityCloud/index.vue
index fe23c698..b1c7d442 100644
--- a/front/src/views/capabilityCloud/index.vue
+++ b/front/src/views/capabilityCloud/index.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-19 10:11:03
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-09 17:05:49
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-07-05 19:47:07
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -32,8 +32,7 @@
   import { useRouter } from 'vue-router'
   const router = useRouter()
   const goHome = () => {
-    // router.push('/home')
-    window.location.replace('/#/home')
+    router.push('/home')
   }
 </script>
 <style lang="less">
diff --git a/front/src/views/capacityOnTheShelf/BusinessComponent.vue b/front/src/views/capacityOnTheShelf/BusinessComponent.vue
index 42f6ceba..558d590d 100644
--- a/front/src/views/capacityOnTheShelf/BusinessComponent.vue
+++ b/front/src/views/capacityOnTheShelf/BusinessComponent.vue
@@ -298,7 +298,7 @@
   }
   init()
   mybus.on('chageDataFrom', (obj) => {
-    if (obj.attrType == '使用手册' && obj.attrValue != null) {
+    if (obj.attrType == '技术文档' && obj.attrValue != null) {
       shiyongshouce.value = obj
     }
     dataFrom.value.infoList = dataFrom.value.infoList.filter(
@@ -310,7 +310,7 @@
     dataFrom.value.infoList.push(obj)
     if (shiyongshouce.value.attrValue) {
       dataFrom.value.infoList.map((syscitem, syscindex) => {
-        if (syscitem.attrType == '使用手册') {
+        if (syscitem.attrType == '技术文档') {
           dataFrom.value.infoList[syscindex] = shiyongshouce.value
         }
       })
diff --git a/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue b/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue
index 38c2fd6f..3fbc894b 100644
--- a/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue
@@ -41,6 +41,7 @@
 <script setup>
   import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
   import { ref, defineProps, watch } from 'vue'
+
   let dataFrom = ref({
     title: '部署与安全',
     englishTitle: 'DEPLOY&SAFE',
@@ -60,15 +61,7 @@
     dataList: { type: Object, default: null },
   })
   if (props.dataList.infoList) {
-    if(props.dataList.link) {
-       let obj = {
-          attrType: '访问地址',
-          attrValue: props.dataList.link
-        }
-        props.dataList.infoList.push(obj)
-    }
     props.dataList.infoList.map((item) => {
-      debugger
       if (
         item.attrType === '部署区域' ||
         item.attrType === '是否统一登录' ||
@@ -114,13 +107,6 @@
     () => props.dataList,
     (val) => {
       if (val) {
-        if(props.dataList.link) {
-       let obj = {
-          attrType: '访问地址',
-          attrValue: props.dataList.link
-        }
-        props.dataList.infoList.push(obj)
-    }
         dataFrom.value.content[0].childrenContent = []
         dataFrom.value.content[1].childrenContent = []
         props.dataList.infoList.map((item) => {
diff --git a/front/src/views/home/Navigation.vue b/front/src/views/home/Navigation.vue
index 75e59a22..0d6da8ac 100644
--- a/front/src/views/home/Navigation.vue
+++ b/front/src/views/home/Navigation.vue
@@ -70,7 +70,7 @@
           {
             componentCapability: '组件服务0',
             applicationResources: '应用资源0',
-            infrastructure: '基础设施0',
+            infrastructure: '基础设施23万',
             dataResources: '数据资源10387',
             knowledgeBase: '知识库12',
           },
diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index ffc7b1a5..5d0ab90e 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -848,10 +848,6 @@
           background: url('~@/assets/home/rhfw_square.png') no-repeat;
           background-size: 100%;
         }
-        .jcss {
-          background: url('~@/assets/home/sxt_square.png') no-repeat;
-          background-size: 100%;
-        }
         .header {
           display: flex;
           justify-content: space-between;