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

2022-07-25 09:52:41 +08:00 · 2022-07-25 09:52:41 +08:00 · 4ee80c7529
parent df43efef31 fe349c3ff3
commit 4ee80c7529
42 changed files with 1140 additions and 1015 deletions
--- a/back/public/index.html
+++ b/back/public/index.html
@ -27,7 +27,7 @@
      'isTab': true,     // 是否通过tab展示内容?
      'iframeURL': ''    // 是否通过iframe嵌套展示内容? (以http[s]://开头, 自动匹配)
    };
-    window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/#/vueTemplateDemo';  
+    window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.243:9796/#/vueTemplateDemo';  
    // window.SITE_CONFIG['frontUrl'] = 'http://124.222.94.39:9796/#/vueTemplateDemo';
    // window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/#/vueTemplateDemo';  
    // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9797/#/vueTemplateDemo'; 
@ -72,9 +72,9 @@
    <script>
      
      // window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin';
-
+      window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.243:9796/';
            // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
-        window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin';
+        window.SITE_CONFIG['apiURL'] = 'http://15.2.21.243:8888/renren-admin';
      // window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
      // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
      // WebSocket地址
--- a/back/src/views/modules/activiti/demo/putaway-process3.vue
+++ b/back/src/views/modules/activiti/demo/putaway-process3.vue
@ -98,7 +98,7 @@
        </div>
      </div>
    </div>
-    <div class="agreeOr" v-if="this.dataForm.taskId">
+    <div class="agreeOr" v-if="taskId">
      <div>
        <!-- <el-radio-group v-model="agreeOrList" style="width:230px;">
          <el-radio-button label="同意" class="blueAll" @click="showDialog('同意')">同意</el-radio-button>
@ -136,6 +136,7 @@

 <script>
 // 引入工作流公共方法
+import bus from '@/views/bus.js'
 import processModule from '@/mixins/process-module'
 import RenProcessDetail from '@/components/ren-process-detail/src/ren-process-detail'
 import debounce from 'lodash/debounce'
@ -154,6 +155,7 @@ export default {
      dataForm: [],
      deptName: '',
      dataList: {},
+      taskId: '',
      datalistrighttablelist: [
        '赋能应用名称',
        '应用归属部门',
@ -242,6 +244,7 @@ export default {
                }
                return
              }
+              bus.$emit('AbilityResourcesRemovedInit')
              this.$message({
                message: this.$t('prompt.success'),
                type: 'success',
@ -271,6 +274,7 @@ export default {
                }
                return
              }
+              bus.$emit('AbilityResourcesRemovedInit')
              this.$message({
                message: this.$t('prompt.success'),
                type: 'success',
@ -324,6 +328,7 @@ export default {
    taskHandleErrorCallback (data) {}
  },
  created () {
+    this.taskId = this.$route.params.taskId
    this.dataForm.taskId = this.$route.params.taskId
    this.init()
  },
--- a/back/src/views/modules/myAgent/AbilityResourceShelf.vue
+++ b/back/src/views/modules/myAgent/AbilityResourceShelf.vue
@ -2,7 +2,7 @@
 * @Author: hisense.liangjunhua
 * @Date: 2022-06-27 11:27:22
 * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-29 16:31:26
+ * @LastEditTime: 2022-07-25 09:45:35
 * @Description: "能力资源上架"
 -->
 <template>
@ -128,6 +128,7 @@
 </template>

 <script>
+import bus from '@/views/bus.js'
 import mixinViewModule from '@/mixins/view-module'
 import processModule from '@/mixins/process-module'
 export default {
@ -165,6 +166,12 @@ export default {
      }
      this.getProcDefRouteSet(row, this.forwardTaskDetail)
    }
+  },
+  created () {
+    bus.$off('abilityResourceShelfInit')
+    bus.$on('abilityResourceShelfInit', () => {
+      this.getDataList()
+    })
  }
 }
 </script>
--- a/back/src/views/modules/myAgent/AbilityResourcesRemoved.vue
+++ b/back/src/views/modules/myAgent/AbilityResourcesRemoved.vue
@ -2,7 +2,7 @@
 * @Author: hisense.liangjunhua
 * @Date: 2022-06-27 11:27:22
 * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-29 16:31:26
+ * @LastEditTime: 2022-07-25 09:48:46
 * @Description: "能力资源下架"
 -->
 <template>
@ -128,6 +128,7 @@
 </template>

 <script>
+import bus from '@/views/bus.js'
 import mixinViewModule from '@/mixins/view-module'
 import processModule from '@/mixins/process-module'
 export default {
@ -165,6 +166,12 @@ export default {
      }
      this.getProcDefRouteSet(row, this.forwardTaskDetail)
    }
+  },
+  created () {
+    bus.$off('AbilityResourcesRemovedInit')
+    bus.$on('AbilityResourcesRemovedInit', () => {
+      this.getDataList()
+    })
  }
 }
 </script>
--- a/back/src/views/modules/myAgent/CompetencyApplication.vue
+++ b/back/src/views/modules/myAgent/CompetencyApplication.vue
@ -2,7 +2,7 @@
 * @Author: hisense.liangjunhua
 * @Date: 2022-06-27 11:27:22
 * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-29 16:31:26
+ * @LastEditTime: 2022-07-25 09:39:01
 * @Description: 能力申请
 -->
 <template>
@ -118,6 +118,7 @@
 </template>

 <script>
+import bus from '@/views/bus.js'
 import mixinViewModule from '@/mixins/view-module'
 import processModule from '@/mixins/process-module'
 export default {
@ -155,6 +156,12 @@ export default {
      }
      this.getProcDefRouteSet(row, this.forwardTaskDetail)
    }
+  },
+  created () {
+    bus.$off('competencyApplicationInit')
+    bus.$on('competencyApplicationInit', () => {
+      this.getDataList()
+    })
  }
 }
 </script>
--- a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
+++ b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
@ -83,6 +83,7 @@
 </template>

 <script>
+import bus from '@/views/bus.js'
 import ResourcesAndServices from './ResourcesAndServices.vue'
 import debounce from 'lodash/debounce'
 import qs from 'qs'
@ -214,6 +215,7 @@ export default {
                }
                return
              }
+              bus.$emit('abilityResourceShelfInit')
              this.$message({
                message: this.$t('prompt.success'),
                type: 'success',
@ -244,6 +246,7 @@ export default {
                }
                return
              }
+              bus.$emit('abilityResourceShelfInit')
              this.$message({
                message: this.$t('prompt.success'),
                type: 'success',
--- a/back/src/views/modules/myAgent/demo/competency-application.vue
+++ b/back/src/views/modules/myAgent/demo/competency-application.vue
@ -2,7 +2,7 @@
 * @Author: hisense.liangjunhua
 * @Date: 2022-06-29 15:59:51
 * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-21 16:41:09
+ * @LastEditTime: 2022-07-25 09:42:46
 * @Description: 告诉大家这是什么
 -->
 <!--  流程业务表单   -->
@ -29,16 +29,18 @@
              {{ dataForm.content.title || '--' }}</span
            ></span
          >
-          <span class="text"
+          <span class="text" v-if="dataForm.content.applicationSystem"
            >应用系统：<span>{{
              dataForm.content.applicationSystem || '--'
            }}</span></span
          >
-          <span class="text"
+          <span class="text" ></span>
+        </p>
+        <p>
+          <span v-if="dataForm.content.applicationSceneStr"
            >应用场景：<span>
              {{ dataForm.content.applicationSceneStr || '--' }}</span
-            ></span
-          >
+            ></span>
        </p>
        <p>
          <span>
@ -131,6 +133,7 @@ import processModule from '@/mixins/process-module'
 import debounce from 'lodash/debounce'
 import qs from 'qs'
 import RenProcessDetail from '@/components/ren-process-detail/src/ren-process-detail'
+import bus from '@/views/bus.js'
 export default {
  // 注入公共方法
  mixins: [processModule],
@ -386,6 +389,7 @@ export default {
                }
                return
              }
+              bus.$emit('competencyApplicationInit')
              this.$message({
                message: this.$t('prompt.success'),
                type: 'success',
@ -415,6 +419,7 @@ export default {
                }
                return
              }
+              bus.$emit('competencyApplicationInit')
              this.$message({
                message: this.$t('prompt.success'),
                type: 'success',
--- a/back/src/views/modules/workBench/components/dept-todo-view.vue
+++ b/back/src/views/modules/workBench/components/dept-todo-view.vue
@ -15,21 +15,19 @@
            <div v-for="(item, i) in dataInfo.list" :key="i">
                <!-- 待办 -->
                <el-tooltip effect="dark" v-if="dataInfo.type === 'todo'"
-                    :content="(item.userName || '--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'?'申请':'')"
+                    :content="(item.userName || '--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'&&item.processDefinitionName!=='能力需求申请'?'申请':'')"
                    placement="top">
                    <div class="list-item ellipsis">
                        <!-- {{ `${(item.processDefinitionName || '--')}${item.taskName ? ('—' + item.taskName) : ''}` }} -->
-                        {{(item.userName || '--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'?'申请':'')}}
+                        {{(item.userName || '--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'&&item.processDefinitionName!=='能力需求申请'?'申请':'')}}
                    </div>
                </el-tooltip>
                <!-- 已办 -->
                <el-tooltip effect="dark" v-else
-                    :content="`${(item.processDefinitionName || '--')}${item.resourceName ? ('—' + item.resourceName) : ''}`"
+                    :content="(item.startUserName||'--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'&&item.processDefinitionName!=='能力需求申请'?'申请':'')"
                    placement="top">
                    <div class="list-item ellipsis">
-                        {{ `${(item.processDefinitionName || '--')}${item.resourceName ? ('—' + item.resourceName) :
-                                ''}`
-                        }}
+                        {{ (item.startUserName||'--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'&&item.processDefinitionName!=='能力需求申请'?'申请':'')}}
                    </div>
                </el-tooltip>
            </div>
--- a/front/.eslintrc.js
+++ b/front/.eslintrc.js
@ -1,3 +1,10 @@
+/*
+ * @Author: hisense.wuhongjian
+ * @Date: 2022-06-14 09:31:29
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-15 16:33:55
+ * @Description: 告诉大家这是什么
+ */
 module.exports = {
  root: true,
  env: {
@ -15,6 +22,7 @@ module.exports = {
  ignorePatterns: [
    'src/supermap',
    'src/views/home/videoSurveillance',
+    'src/views/vab/*',
    'src/utils/coordinateSystemTransform.js',
  ],
 }
--- a/front/package.json
+++ b/front/package.json
@ -5,7 +5,9 @@
  "scripts": {
    "serve": "vue-cli-service serve",
    "build": "vue-cli-service build",
-    "lint": "vue-cli-service lint",
+    "lint": "eslint --ext .js --ext .jsx --ext .vue src/",
+    "lint:fix": "eslint --fix --ext .js,.vue .",
+    "fix": "eslint src/**/*.*  --fix",
    "clear": "rimraf node_modules&&npm install --registry=https://registry.npm.taobao.org",
    "use:npm": "nrm use npm",
    "use:taobao": "nrm use taobao",
@ -48,25 +50,25 @@
  },
  "devDependencies": {
    "@turf/turf": "^6.5.0",
-    "@vue/cli-plugin-babel": "^4.5.9",
-    "@vue/cli-plugin-eslint": "^4.5.9",
+    "@vue/cli-plugin-babel": "^4.5.15",
+    "@vue/cli-plugin-eslint": "^4.5.15",
    "@vue/cli-service": "^4.5.9",
    "@vue/compiler-sfc": "^3.1.4",
-    "@vue/eslint-config-prettier": "^6.0.0",
-    "babel-eslint": "^11.0.0-beta.2",
-    "body-parser": "^1.19.0",
+    "@vue/eslint-config-prettier": "^7.0.0",
+    "babel-eslint": "^10.1.0",
+    "body-parser": "^1.20.0",
    "chalk": "^4.1.1",
    "chokidar": "^3.5.2",
    "crypto-js": "^4.1.1",
-    "eslint": "^7.30.0",
-    "eslint-plugin-prettier": "^3.4.0",
-    "eslint-plugin-vue": "^7.13.0",
+    "eslint": "^7.32.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-vue": "^9.1.1",
    "filemanager-webpack-plugin": "^6.1.4",
    "less": "^4.1.1",
    "less-loader": "^7.3.0",
-    "prettier": "^2.3.2",
+    "prettier": "^2.7.1",
    "stylelint": "^13.13.1",
-    "stylelint-config-prettier": "^8.0.2",
+    "stylelint-config-prettier": "^9.0.3",
    "stylelint-config-recess-order": "^2.4.0",
    "stylus": "^0.54.5",
    "stylus-loader": "^3.0.2",
--- 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-21 15:09:22
+ * @LastEditTime: 2022-07-22 18:42:44
 * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@ -40,9 +40,16 @@
    // window.SITE_CONFIG['frontUrl'] = 'http://10.110.205.1:8002/document/#/devModelFile/';
    // window.SITE_CONFIG['apiURL'] = 'http://10.110.205.1:8000/renren-admin';

+    // 测试环境
+    // window.SITE_CONFIG['backUrl'] = 'http://15.2.21.243:9797';
+    // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.243:9796/';
+    // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.243:9796/document/#/devModelFile/';
+    // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.243:8888/renren-admin';
+    // window.SITE_CONFIG['websocketURL'] = '15.2.21.243: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://10.134.135.9:9797';
-    // window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/';基础设施
+    // window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/';
    // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
    // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
    // 开发
@ -52,6 +59,11 @@
    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://15.2.21.238:9797';
+    // 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.239: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';
    // window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/';
--- a/front/src/api/capabilityCloud.js
+++ b/front/src/api/capabilityCloud.js
@ -83,14 +83,22 @@ export function dataResourceInfo(params) {
 //能力云图-调用趋势
 export function callTheTrendPort(start, end, params) {
  return request({
-    url: '/metrics/api/v1/query_range?query=sum(increase(apigateway_http_status%5B1d%5D))&start=' + start + '&end=' + end + '&step=' + params,
+    url:
+      '/metrics/api/v1/query_range?query=sum(increase(apigateway_http_status%5B1d%5D))&start=' +
+      start +
+      '&end=' +
+      end +
+      '&step=' +
+      params,
    method: 'get',
  })
 }
 //能力云图-调用次数
 export function totalCallsSnum(params) {
  return request({
-    url: '/metrics/api/v1/query?query=sum(apigateway_http_status)&time=1655793262.495' + params,
+    url:
+      '/metrics/api/v1/query?query=sum(apigateway_http_status)&time=1655793262.495' +
+      params,
    method: 'get',
  })
 }
--- a/front/src/config/default/setting.config.js
+++ b/front/src/config/default/setting.config.js
@ -50,7 +50,14 @@ const setting = {
  //路由模式，可选值为 history 或 hash
  routerMode: 'hash',
  //不经过token校验的路由
-  routesWhiteList: ['/login', '/register', '/callback', '/404', '/403', '/capabilityCloud'], // 新增统计云图白名单
+  routesWhiteList: [
+    '/login',
+    '/register',
+    '/callback',
+    '/404',
+    '/403',
+    '/capabilityCloud',
+  ], // 新增统计云图白名单
  //加载时显示文字
  loadingText: '正在加载中...',
  //token名称
--- 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.wuhongjian
- * @LastEditTime: 2022-07-21 18:39:03
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-07-22 16:03:23
 * @Description: 告诉大家这是什么
 */
 import { createApp } from 'vue'
--- a/front/src/utils/request.js
+++ b/front/src/utils/request.js
@ -35,7 +35,7 @@ const handleCode = (code, msg, res) => {
      message.error(msg || '接口异常')
      break
    case 302:
-      window.location.href = redirect
+      // window.location.href = redirect
      break
  }
 }
--- a/front/src/vab/plugins/permissions.js
+++ b/front/src/vab/plugins/permissions.js
@ -2,7 +2,7 @@
 * @Author: hisense.wuhongjian
 * @Date: 2022-04-01 17:23:11
 * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-18 11:25:28
+ * @LastEditTime: 2022-07-18 18:45:20
 * @Description: 告诉大家这是什么
 */
 /**
--- a/front/src/views/assignCase/components/queryPage.vue
+++ b/front/src/views/assignCase/components/queryPage.vue
@ -53,10 +53,7 @@
              v-for="(item, index) in contenBox"
              :key="index"
            >
-              <img
-                :src="item.note1"
-                alt=""
-              />
+              <img :src="item.note1" alt="" />
              <h3>{{ item.name }}</h3>
              <p>
                发布时间
--- a/front/src/views/detailsAll/AlgorithmDetails.vue
+++ b/front/src/views/detailsAll/AlgorithmDetails.vue
@ -2,7 +2,7 @@
 * @Author: hisense.liangjunhua
 * @Date: 2022-06-08 11:32:22
 * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-06-30 17:06:56
+ * @LastEditTime: 2022-07-18 18:49:30
 * @Description: 算法详情页
 -->
 <template>
--- a/front/src/views/detailsAll/ApplicationDetails.vue
+++ b/front/src/views/detailsAll/ApplicationDetails.vue
@ -1,8 +1,8 @@
 <!--
 * @Author: hisense.liangjunhua
 * @Date: 2022-06-08 11:32:22
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-18 13:55:03
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-07-22 18:43:37
 * @Description: 应用详情页
 -->
 <template>
@ -87,16 +87,15 @@
  import ApplicationTopDetails from '@/views/detailsAll/components/Application/ApplicationTopDetails.vue'
  import ApplicationNavigation from '@/views/detailsAll/components/Application/ApplicationNavigation.vue'
  import ApplicationPresentation from '@/views/detailsAll/components/Application/ApplicationPresentation.vue'
-  import ApplicationAbilityTrial from '@/views/detailsAll/components/Application/ApplicationAbilityTrial.vue'
-  import ApplicationCommonProblem from '@/views/detailsAll/components/Application/ApplicationCommonProblem' //常见问题
+  import ApplicationCommonProblem from '@/views/detailsAll/components/Application/ApplicationCommonProblem.vue'
  import { ref, onMounted, onBeforeUnmount, reactive } from 'vue'
-  import { useRouter } from 'vue-router'
  import {
    updateVisits,
    selectOne,
    queryPartAppByKeyId,
    browsingInsert,
  } from '@/api/home'
+  import { useRouter } from 'vue-router'
  import mybus from '@/myplugins/mybus'
  const associatedComponents = ref([{ type: '组件服务', dataList: [] }])
  let loading = ref(true)
--- a/front/src/views/detailsAll/BusinessDetails.vue
+++ b/front/src/views/detailsAll/BusinessDetails.vue
@ -1,8 +1,8 @@
 <!--
 * @Author: hisense.gaoyuanwei
 * @Date: 2022-06-20 10:12:22
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-20 18:58:56
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-18 18:49:01
 * @Description: 业务组件详情页
 -->
 <template>
--- a/front/src/views/detailsAll/DeveloperComponents.vue
+++ b/front/src/views/detailsAll/DeveloperComponents.vue
@ -1,8 +1,8 @@
 <!--
 * @Author: hisense.liangjunhua
 * @Date: 2022-06-08 11:32:22
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-20 18:59:01
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-18 18:48:53
 * @Description: 开发组件详情页
 -->
 <template>
--- a/front/src/views/detailsAll/LayerService.vue
+++ b/front/src/views/detailsAll/LayerService.vue
@ -1,8 +1,8 @@
 <!--
 * @Author: hisense.liangjunhua
 * @Date: 2022-06-08 11:32:22
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-20 18:59:01
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-18 18:48:32
 * @Description: 图层服务详情页
 -->
 <template>
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmOnTrial.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmOnTrial.vue
@ -38,7 +38,9 @@
    () => props.dataList,
    (val) => {
      if (val) {
-        let obj = val.infoList.filter((item) => item.attrType === '试用地址' && item.attrValue)[0]
+        let obj = val.infoList.filter(
+          (item) => item.attrType === '试用地址' && item.attrValue
+        )[0]
        if (!obj) {
          flag.value = false
        } else {
--- a/front/src/views/detailsAll/components/Algorithm/PictureCharacterRecognition.vue
+++ b/front/src/views/detailsAll/components/Algorithm/PictureCharacterRecognition.vue
@ -73,7 +73,7 @@
 </template>
 <script setup>
  import { ref, onMounted } from 'vue'
-  import { paddleocr,algo } from '@/api/file'
+  import { algo } from '@/api/file'
  import { message } from 'ant-design-vue'
  import { useRouter } from 'vue-router'
  const router = useRouter()
@ -85,10 +85,12 @@
  const imageResult1 = ref('')
  const menuOpenKeys2 = ref(['全文还原'])
  // 图片初始化
-  let responseUrl = ref('static/image/' + router.currentRoute.value.query.exampleImg)
+  let responseUrl = ref(
+    'static/image/' + router.currentRoute.value.query.exampleImg
+  )
  const imgType = router.currentRoute.value.query.exampleImg.split('.')[1]
  const handleChange = (info) => {
-    debugger;
+    debugger
    if (info.file.status !== 'uploading') {
      console.log(info.file, info.fileList)
    }
@ -111,7 +113,7 @@
        company: router.currentRoute.value.query.company,
        algorithmName: router.currentRoute.value.query.algorithmName,
        data: base64.split('base64,')[1],
-        type: router.currentRoute.value.query.type
+        type: router.currentRoute.value.query.type,
      }
      algo(param).then((res) => {
        // wordValue.value = res.data
--- a/front/src/views/detailsAll/components/Algorithm/TestOfWords.vue
+++ b/front/src/views/detailsAll/components/Algorithm/TestOfWords.vue
@ -43,7 +43,7 @@
 </template>
 <script setup>
  import { ref } from 'vue'
-  import { correct,algo } from '@/api/file'
+  import { algo } from '@/api/file'
  import { useRouter } from 'vue-router'
  const router = useRouter()
  // const keyId = router.currentRoute.value.query.id
@ -58,7 +58,7 @@
      company: router.currentRoute.value.query.company,
      algorithmName: router.currentRoute.value.query.algorithmName,
      data: wordValue.value,
-      type: router.currentRoute.value.query.type
+      type: router.currentRoute.value.query.type,
    }
    // correct(param).then((res) => {
    //   // wordContent.value = res.data.data
@ -72,7 +72,7 @@
    //     errorWordContent.value = val.value
    //   })
    // })
-    algo(param).then(res=>{
+    algo(param).then((res) => {
      errorWord.value = res.data.data.text_data
    })
  }
--- a/front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue
@ -60,7 +60,7 @@
    password2: '',
  })
  if (props.dataList.infoList) {
-    let obj = props.dataList.applyState
+    let obj = props.dataList.approveStatus
    if (obj !== '通过') {
      flag.value = false
    } else {
@ -110,7 +110,7 @@
    () => props.dataList,
    (val) => {
      if (val) {
-        let obj = props.dataList.applyState
+        let obj = props.dataList.approveStatus
        if (obj !== '通过') {
          flag.value = false
        } else {
--- a/front/src/views/detailsAll/components/Application/ApplicationCommonProblem.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationCommonProblem.vue
@ -16,9 +16,7 @@
        </div>
      </div>
    </div>
-    <div v-else class="no-data">
-      暂无数据
-    </div>
+    <div v-else class="no-data">暂无数据</div>
  </div>
 </template>

--- a/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue
@ -106,7 +106,7 @@
    if (
      props.dataList.link &&
      whoShow1.value.itShowQingDao &&
-      props.dataList.applyState === '通过'
+      props.dataList.approveStatus === '通过'
    ) {
      list.value.push('应用详情')
    }
@ -154,7 +154,7 @@
        if (
          props.dataList.link &&
          whoShow1.value.itShowQingDao &&
-          props.dataList.applyState === '通过'
+          props.dataList.approveStatus === '通过'
        ) {
          list.value.push('应用详情')
        }
--- a/front/src/views/detailsAll/components/Application/ApplicationPresentation.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationPresentation.vue
@ -1,8 +1,8 @@
 <!--
 * @Author: hisense.liangjunhua
 * @Date: 2022-06-08 15:25:33
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-16 16:58:16
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-16 17:03:24
 * @Description: 应用展示  视频播放
 -->
 <template>
--- a/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue
@ -1,8 +1,8 @@
 <!--
 * @Author: hisense.liangjunhua
 * @Date: 2022-06-08 11:56:28
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-21 16:18:54
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-21 18:17:30
 * @Description: 算法详情页头部
 -->
 <template>
--- a/front/src/views/detailsAll/components/Business/BusinessNavigation.vue
+++ b/front/src/views/detailsAll/components/Business/BusinessNavigation.vue
@ -1,8 +1,8 @@
 <!--
 * @Author: hisense.liangjunhua
 * @Date: 2022-06-08 14:54:01
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-15 18:24:39
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-16 16:43:19
 * @Description: 应用详情页导航
 -->
 <template>
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@ -1034,7 +1034,8 @@
                  loading.value = false
                } else {
                  resourceTotal.value = res.data.data.total || ''
-                  getShoppingCartList(res.data.data.records)
+                  resourceList.data = res.data.data.records || []
+                  // getShoppingCartList(res.data.data.records)
                }
              })
            }
@ -1111,7 +1112,8 @@
                loading.value = false
              } else {
                resourceTotal.value = res.data.data.total || ''
-                getShoppingCartList(res.data.data.records)
+                resourceList.data = res.data.data.records || []
+                // getShoppingCartList(res.data.data.records)
              }
            })
          }
@ -1129,12 +1131,12 @@
        }).then((res) => {
          console.log('申购车列表================>', res.data.data.records)
          shoppingCartList.value = res.data.data.records
-          list.map((item) => {
-            item.isInShoppingCart = false
-            item.isInShoppingCart = shoppingCartList.value.some((item2) => {
-              return item.id === item2.resourceId
-            })
-          })
+          // list.map((item) => {
+          //   item.isInShoppingCart = false
+          //   item.isInShoppingCart = shoppingCartList.value.some((item2) => {
+          //     return item.id === item2.resourceId
+          //   })
+          // })
          console.log('经过过滤后的列表信息', list)
          resourceList.data = list
        })
--- a/front/src/views/home/components/CompareGroupView.vue
+++ b/front/src/views/home/components/CompareGroupView.vue
@ -2,11 +2,17 @@
  <div>
    <div v-if="groupArray.length > 0">
      <div class="group-box" v-for="(data, i) in groupArray" :key="i">
-                <div class="flex-row-start row-tr" v-for="(item, j) in Object.keys(data)" :key="j"
-                    :class="j == Object.keys(data).length - 1 ? 'border-bottom' : ''">
+        <div
+          class="flex-row-start row-tr"
+          v-for="(item, j) in Object.keys(data)"
+          :key="j"
+          :class="j == Object.keys(data).length - 1 ? 'border-bottom' : ''"
+        >
          <div class="td-name">{{ item }}</div>
          <div class="flex-row-start">
-                        <div class="td" v-for="(d, k) in data[item]" :key="k">{{ d || '--' }}</div>
+            <div class="td" v-for="(d, k) in data[item]" :key="k">
+              {{ d || '--' }}
+            </div>
          </div>
        </div>
      </div>
@ -14,13 +20,12 @@
    {{ '哈啊哈哈哈哈' + groupArray.length }}
    <div v-if="groupArray.length == 0" class="no-data">暂无数据</div>
  </div>
-
 </template>

 <script>
-import { defineComponent, ref, onMounted, getCurrentInstance, computed, watch, nextTick } from 'vue'
+  import { ref, watch, nextTick } from 'vue'
  export default {
-    props: ["dataList"],
+    props: ['dataList'],
    setup(props) {
      let groupArray = ref([])
      watch(
@ -28,26 +33,26 @@ export default {
          return props.dataList
        },
        (newVal) => {
-                console.log('newVal------------>', newVal);
+          console.log('newVal------------>', newVal)
          groupArray = ref([])
-                newVal.map(v => {
+          newVal.map((v) => {
            groupArray.value.push(v)
          })
          groupArray.value = groupArray.value.splice(0)
          nextTick(() => {
-                    console.log('groupArray---子组件--------->', groupArray.value);
+            console.log('groupArray---子组件--------->', groupArray.value)
          })
        },
        {
          deep: true,
-                immediate: true
+          immediate: true,
        }
      )

      return {
        groupArray,
      }
-    }
+    },
  }
 </script>

@ -89,7 +94,6 @@ nextTick(() => {
    border-right: none;
  }

-
  .row-tr {
    border: 1px solid #dddee1;
    border-right: none;
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@ -589,7 +589,6 @@
      // 加入申购车
      const addShoppingCart = (item, index) => {
        console.log('item===============>', item)
-        mybus.emit('changeSelcted', index)
        if (flag.value && item.id) {
          flag.value = false
          sgcInsert({
@ -600,6 +599,7 @@
            console.log(res)
            message.success('添加申购车成功！')
            mybus.emit('getSgcNum')
+            mybus.emit('changeSelcted', index)
            flag.value = true
          })
        }
@ -789,7 +789,7 @@
    },
    beforeUnmount() {
      mybus.off('chongzhi')
-      mybus.emit('changeSelcted')
+      // mybus.emit('changeSelcted')
    },
  }
 </script>
--- a/front/src/views/home/integrationServicesDetails.vue
+++ b/front/src/views/home/integrationServicesDetails.vue
@ -2,13 +2,20 @@
 <template>
  <div class="IntegrationServicesDetails" :class="{ fixed2: scrollTop >= 600 }">
    <!-- 头部基本信息 -->
-    <application-top-details :dataList="detailInfoObj" :navList="navList"></application-top-details>
+    <application-top-details
+      :dataList="detailInfoObj"
+      :navList="navList"
+    ></application-top-details>

    <!-- 导航 -->
    <div :class="{ fixed: scrollTop >= 600 }">
      <div class="application-navigation">
        <template v-for="nav in navList" :key="nav.key">
-          <div class="nav" :class="{ selectNow: nav.key == selectNow }" @click="selectNav(nav.key)">
+          <div
+            class="nav"
+            :class="{ selectNow: nav.key == selectNow }"
+            @click="selectNav(nav.key)"
+          >
            {{ nav.name }}
            <span class="line"></span>
          </div>
@ -17,7 +24,10 @@
    </div>

    <!-- 组合能力 -->
-    <div id="integration-combination-ability" class="combination-ability scrollBox">
+    <div
+      id="integration-combination-ability"
+      class="combination-ability scrollBox"
+    >
      <div class="title-1">
        <DetalsTitle title="组合能力" type="COMBINATION ABILITY"></DetalsTitle>
      </div>
@ -50,9 +60,17 @@
          </div>
        </div>
        <div class="content-card flex-row-start">
-          <div class="right-item content-card-item" v-for="(use, i) in useWayShowList" :key="i">
+          <div
+            class="right-item content-card-item"
+            v-for="(use, i) in useWayShowList"
+            :key="i"
+          >
            <div class="card-title title">{{ use.title }}</div>
-            <div class="card-text" v-for="(d, k) in Object.keys(use.info)" :key="k">
+            <div
+              class="card-text"
+              v-for="(d, k) in Object.keys(use.info)"
+              :key="k"
+            >
              {{ use.info[d] }}:{{ detailInfoObj[d] || '--' }}
            </div>
          </div>
@ -61,8 +79,11 @@
    </div>

    <!-- 常见问题-->
-    <application-common-problem :dataList="detailInfoObj" id="common-problem" class="scrollBox">
-    </application-common-problem>
+    <application-common-problem
+      :dataList="detailInfoObj"
+      id="common-problem"
+      class="scrollBox"
+    ></application-common-problem>

    <home-footer></home-footer>
  </div>
@ -73,11 +94,11 @@ import ApplicationTopDetails from '@/views/detailsAll/components/Application/App
  import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
  import ApplicationCommonProblem from '@/views/detailsAll/components/Application/ApplicationCommonProblem' //常见问题
  import HomeFooter from '@/views/newHome/components/Footer'
-import { ref, onMounted, onBeforeUnmount, reactive } from 'vue'
+  import { ref, onMounted, onBeforeUnmount } from 'vue'
  import { useRouter } from 'vue-router'
  import { getIntegrationDetail } from '@/api/home'
  import mybus from '@/myplugins/mybus'
-
+  import { message } from 'ant-design-vue'
  const router = useRouter()
  const scrollTop = ref(0)
  const domArr = ref([])
@ -87,7 +108,9 @@ document.documentElement.scrollTop = 0
  document.body.style.transition = 'all 0.3s ease'
  document.body.scrollTop = 0
  mybus.on('flyToView', (id) => {
-  let top = document.querySelector('#' + id) && document.querySelector('#' + id).offsetTop - 50;
+    let top =
+      document.querySelector('#' + id) &&
+      document.querySelector('#' + id).offsetTop - 50
    document.documentElement.scrollTop = top
    document.body.scrollTop = top
  })
@ -129,15 +152,15 @@ const useWayShowList = ref([
  const combineList = ref([
    {
      title: '基础设施',
-    list: []
+      list: [],
    },
    {
      title: '组件服务',
-    list: []
+      list: [],
    },
    {
      title: '数据资源',
-    list: []
+      list: [],
    },
  ])
  const detailInfoObj = ref({})
@ -175,7 +198,8 @@ const selectNav = (key) => {

  // 融合服务--详情
  const getIntegrationServicesDeatil = (id) => {
-  getIntegrationDetail(id).then(res => {
+    getIntegrationDetail(id).then(
+      (res) => {
        if (res.data.code !== 0) {
          return message.error(res.data.msg)
        }
@ -184,32 +208,42 @@ const getIntegrationServicesDeatil = (id) => {
        let fuseAttrList = res.data.data.fuseAttrList || []
        // 融合关系
        let fuseResourceList = res.data.data.fuseResourceList || []
-    let questionValue = fuseAttrList.find(v => v.attrType === '常见问题') || {}
+        let questionValue =
+          fuseAttrList.find((v) => v.attrType === '常见问题') || {}
        let questionObj = {
          attrType: '常见问题',
-      attrValue: questionValue.attrValue || "[]"
+          attrValue: questionValue.attrValue || '[]',
        }
        let areaObj = {
          attrType: '应用领域',
-      attrValue: detailInfoObj.value.applicationArea
+          attrValue: detailInfoObj.value.applicationArea,
        }
-    combineList.value.map(item => {
-      let arr = (fuseResourceList.filter(v => v.resource && v.resource.type == item.title) || []).map(d => d.resource.name)
-      item.list = arr;
+        combineList.value.map((item) => {
+          let arr = (
+            fuseResourceList.filter(
+              (v) => v.resource && v.resource.type == item.title
+            ) || []
+          ).map((d) => d.resource.name)
+          item.list = arr
          return item
        })
        detailInfoObj.value.infoList = []
        detailInfoObj.value.infoList.push(questionObj)
        detailInfoObj.value.infoList.push(areaObj)
-  }, err => {
+      },
+      (err) => {
        message.error(err)
-  })
+      }
+    )
  }
  getIntegrationServicesDeatil(id)

  function handleOpenUrl(type) {
-  let obj = (detailInfoObj.value.fuseAttrList || []).find(v => v.attrType == type) || {};
-  let url = obj.attrValue || '';
+    let obj =
+      (detailInfoObj.value.fuseAttrList || []).find(
+        (v) => v.attrType == type
+      ) || {}
+    let url = obj.attrValue || ''
    if (!obj.attrValue) {
      return message.error('错误的文档链接地址！')
    }
@ -247,7 +281,6 @@ onBeforeUnmount(() => {
    justify-content: center;
  }

-
  .IntegrationServicesDetails {
    .fixed {
      position: fixed !important;
@ -306,8 +339,6 @@ onBeforeUnmount(() => {
      margin-bottom: 0.3rem;
    }

-
-
    .left {
      .btn {
        padding: 10px 20px;
@ -341,9 +372,11 @@ onBeforeUnmount(() => {
        height: 1.5rem;
        width: 6.2rem;
        border-radius: 0.2rem;
-      background: linear-gradient(to right,
+        background: linear-gradient(
+          to right,
          rgba(113, 132, 252, 0.4),
-          rgba(148, 163, 252, 0.4));
+          rgba(148, 163, 252, 0.4)
+        );
        padding: 0 0.3rem;
        display: flex;
        justify-content: center;
@ -411,10 +444,9 @@ onBeforeUnmount(() => {
        color: #212121;
        text-align: center;
        padding: 0.2rem 0;
-      font-size: .22rem;
+        font-size: 0.22rem;
        text-align: center;
      }
-
    }

    .name-box {
@ -445,6 +477,5 @@ onBeforeUnmount(() => {
      width: 50%;
      box-sizing: border-box;
    }
-
  }
 </style>
--- a/front/src/views/instructionManual/components/abilityDocTree.vue
+++ b/front/src/views/instructionManual/components/abilityDocTree.vue
@ -56,7 +56,7 @@
    clickData: {
      type: Object,
      default: () => {
-        title: ''
+        ''
      },
    },
  })
--- a/front/src/views/instructionManual/index.vue
+++ b/front/src/views/instructionManual/index.vue
@ -4,21 +4,40 @@
    <div id="container" class="content-menu">
      <div class="rela">
        <div class="left">
-          <div class="first-title-text" v-for="(data, i) in titleList" :key="i" @click="changeName(data)"
-            :style="{ color: data.name === titleData.name ? '#0058e1' : '' }">
+          <div
+            class="first-title-text"
+            v-for="(data, i) in titleList"
+            :key="i"
+            @click="changeName(data)"
+            :style="{ color: data.name === titleData.name ? '#0058e1' : '' }"
+          >
            <div class="img" :class="data.className"></div>
            {{ data.name }}
          </div>
-          <abilityDocTree :dataList="treeArray" @treeClick="treeClick" :clickData="clickData"></abilityDocTree>
+          <abilityDocTree
+            :dataList="treeArray"
+            @treeClick="treeClick"
+            :clickData="clickData"
+          ></abilityDocTree>
        </div>
        <div class="right">
-          <div class="new-menu-box" style="height: 100%" v-if="titleData.name === '新手指引'">
+          <div
+            class="new-menu-box"
+            style="height: 100%"
+            v-if="titleData.name === '新手指引'"
+          >
            <!-- 新手指引 -->
            <a-empty description="新手指引" />
          </div>
          <div v-else style="height: 100%">
-            <iframe name="iframeName" width="1000" height="100%" id="iframeId" :frameborder="0"
-              :src="doc_base_url + clickData.doc"></iframe>
+            <iframe
+              name="iframeName"
+              width="1000"
+              height="100%"
+              id="iframeId"
+              :frameborder="0"
+              :src="doc_base_url + clickData.doc"
+            ></iframe>
          </div>
        </div>
      </div>
@ -28,10 +47,10 @@
 <script setup>
  import HomeHeader from '@/views/home/components/header'
  import abilityDocTree from './components/abilityDocTree'
-import { ref, reactive, onMounted, nextTick, watch } from 'vue'
-import { Empty, message } from 'ant-design-vue'
+  import { ref, onMounted } from 'vue'
+  import { message } from 'ant-design-vue'
  import { getDevelopDocTree } from '@/api/home'
-import flatten from '@turf/flatten'
+  // import flatten from '@turf/flatten'

  const titleList = ref([
    {
--- a/front/src/views/newHome/components/Navigation2.vue
+++ b/front/src/views/newHome/components/Navigation2.vue
@ -100,7 +100,7 @@
      query: {
        select: type,
        tecHnosphere: '',
-        appLiCation: ''
+        appLiCation: '',
      },
    })
  }
--- a/front/src/views/personalCenter/components/Collection.vue
+++ b/front/src/views/personalCenter/components/Collection.vue
@ -237,7 +237,7 @@
          resourceId: val.resourceId,
          createDate: val.createDate,
          updateDate: val.updateDate,
-           ...getObj(val, val.resourceDTO ? 'resourceDTO' : 'fuseDTO')
+          ...getObj(val, val.resourceDTO ? 'resourceDTO' : 'fuseDTO'),
        }
        if (checkedList.value.indexOf(val.resourceId) == -1) {
          checkAll.value = false
@ -250,8 +250,8 @@
  }

  function getObj(val, typeStr) {
-    let typeObj = val[typeStr] || {};
-    console.log('typeObj------------>', typeObj);
+    let typeObj = val[typeStr] || {}
+    console.log('typeObj------------>', typeObj)
    return {
      name: typeObj.name,
      type: typeObj.type,
--- a/front/src/views/personalCenter/components/MyBrowse.vue
+++ b/front/src/views/personalCenter/components/MyBrowse.vue
@ -39,7 +39,9 @@
      <a-list-item>
        <a-skeleton avatar :title="false" :loading="!!item.loading" active>
          <a-list-item-meta
-            :description="item.description || '--'"
+            :description="
+              tabList[tabIndex] != '知识库' ? item.description || '--' : ''
+            "
            style="position: relative"
          >
            <template #title>