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

2022-07-18 14:02:33 +08:00 · 2022-07-18 14:02:33 +08:00 · 569d2340ee
parent a168e10105 1dce78dc92
commit 569d2340ee
13 changed files with 680 additions and 499 deletions
--- a/back/src/views/modules/myAgent/demo/Application-resources.vue
+++ b/back/src/views/modules/myAgent/demo/Application-resources.vue
@ -1,22 +0,0 @@
-<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>
--- a/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
+++ b/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
@ -168,20 +168,6 @@ export default {
          this.dataView = val.filter(
            (item) => item.name === this.dataForm.type + '一'
          )[0]
-          console.log(this.dataView)
-          console.log(this.dataForm)
-          // 应用描述
-          // this.dataView.children[0].children[0].children[4].note1 =
-          //   this.dataForm.description
-          // 应用名称
-          // this.dataView.children[0].children[0].children[0].note1 =
-          //   this.dataForm.name
-          // 共享条件
-          this.dataView.children[2].children[1].children[0].note1 =
-            this.dataForm.shareCondition
-          // 共享类型
-          this.dataView.children[2].children[1].children[1].note1 =
-            this.dataForm.shareType
          this.dataForm.infoList.map((item, index) => {
            this.dataView.children.map((itemView, indexView) => {
              // console.log('itemView', itemView)
@ -236,6 +222,7 @@ export default {
                })
              })
            })
+
            if (item.attrType === '功能介绍') {
              this.dataForm.infoList[index].attrValue = JSON.parse(
                item.attrValue
@ -318,7 +305,11 @@ export default {
                })
              })
            })
-            if (item.attrType === '算法优势' || item.attrType === '应用场景') {
+            if (
+              item.attrType === '算法优势' ||
+              item.attrType === '应用场景' ||
+              item.attrType === '功能介绍'
+            ) {
              this.dataForm.infoList[index].attrValue = JSON.parse(
                item.attrValue
              )
--- a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
+++ b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
@ -7,9 +7,6 @@
        @keyup.enter.native="dataFormSubmitHandle()"
        :label-width="$i18n.locale === 'en-US' ? '120px' : 'auto'"
      >
-        <div v-if="shifoushizujian">
-          <Applicationresources></Applicationresources>
-        </div>
        <div v-if="flagShow">
          <ResourcesAndServices
            :dataForm="dataForm"
@ -39,21 +36,31 @@
    <div class="agreeOr">
      <h3>审批</h3>
      <div>
-        <el-radio-group v-model="agreeOrList" style="width:230px;">
+        <el-radio-group v-model="agreeOrList" style="width: 230px">
          <el-radio-button label="同意" class="blueAll">同意</el-radio-button>
          <el-radio-button label="退回" class="redAll">退回</el-radio-button>
        </el-radio-group>
-        <el-input v-if="agreeOrList ==='同意' " v-model="inputAgree" placeholder="请输入同意意见"></el-input>
-        <el-input v-if="agreeOrList ==='退回'" v-model="inputNo" placeholder="请输入退回意见"></el-input>
-         <el-button class="inputBule" @click.native="agreeOrNot($store.state.contentTabsActiveName)">提交</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.native="agreeOrNot($store.state.contentTabsActiveName)"
+          >提交</el-button
+        >
      </div>
    </div>
  </div>
 </template>

 <script>
-import processModule from '@/mixins/process-module'
-import Applicationresources from './Application-resources.vue'
 import ResourcesAndServices from './ResourcesAndServices.vue'
 import debounce from 'lodash/debounce'
 import qs from 'qs'
@ -62,7 +69,6 @@ export default {
  // 注入公共方法
  // mixins: [processModule],
  components: {
-    Applicationresources,
    ResourcesAndServices
  },
  props: {
@ -146,7 +152,8 @@ export default {
        // }
      })
    },
-    agreeOrNot: debounce(function (data) {
+    agreeOrNot: debounce(
+      function (data) {
        console.log(data)
        if (this.agreeOrList === '同意') {
          console.log('this.dataForm.taskId', this.taskId)
@ -155,7 +162,9 @@ export default {
            comment: this.inputAgree
          })
          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) {
@ -174,14 +183,17 @@ export default {
                  }
                }
              })
-        }).catch(() => {})
+            })
+            .catch(() => {})
        } else if (this.agreeOrList === '退回') {
          console.log('this.dataForm.taskId', this.taskId)
          const params = qs.stringify({
            taskId: this.taskId,
            comment: this.inputNo
          })
-        this.$http.post('/act/task/backToFirst?', params).then(({ data: res }) => {
+          this.$http
+            .post('/act/task/backToFirst?', params)
+            .then(({ data: res }) => {
              if (res.code !== 0) {
                this.$message.error(res.msg)
                if (this.callbacks.taskHandleErrorCallback) {
@ -203,7 +215,10 @@ export default {
            })
        }
        this.tabRemoveHandle(data)
-    }, 1000, { leading: true, trailing: false }),
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
    tabRemoveHandle (tabName) {
      console.log(tabName, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
      if (tabName === 'home') {
@ -231,7 +246,6 @@ export default {
      }
    }
  }
-
 }
 </script>
 <style scoped lang="scss">
--- a/front/public/static/config/location.js
+++ b/front/public/static/config/location.js
@ -2,12 +2,12 @@
 * @Author: hisense.wuhongjian
 * @Date: 2020-07-07 16:03:23
 * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-14 10:01:08
+ * @LastEditTime: 2022-07-18 11:34:38
 * @Description: 数据资源参数配置
 */
-const newLocation = 'qingdao'
+//const newLocation = 'qingdao'
 // const newLocation = 'baotou'
-//  const newLocation = 'xihaian'
+const newLocation = 'xihaian'

 // 数据资源数据
 const whoShow = {}
--- a/front/src/assets/newHome/newHome-title-bg-xihaian.png
+++ b/front/src/assets/newHome/newHome-title-bg-xihaian.png
--- 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-16 10:57:59
+ * @LastEditTime: 2022-07-18 11:25:28
 * @Description: 告诉大家这是什么
 */
 /**
@ -48,8 +48,7 @@
      next()
    } else {
      // 这里是一个单点登录的入口
-       if (to.query.redict)
-         getUserInfo(to.query.redict)
+      if (to.query.redict) getUserInfo(to.query.redict)
      else {
        getUserInfo()
      }
--- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
+++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
@ -2,7 +2,7 @@
 * @Author: hisense.liangjunhua
 * @Date: 2022-06-17 14:11:08
 * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-16 15:05:16
+ * @LastEditTime: 2022-07-18 11:23:39
 * @Description: 上架
 -->
 <template>
@ -695,7 +695,7 @@
    console.log('targetKeys: ', nextTargetKeys)
    console.log('direction: ', direction)
    console.log('moveKeys: ', moveKeys)
-    targetKeys.value = moveKeys
+    targetKeys.value = moveKeys.filter((item, index) => index === 0)
  }

  const handleSelectChange = (sourceSelectedKeys, targetSelectedKeys) => {
--- a/front/src/views/demandCenter/index.vue
+++ b/front/src/views/demandCenter/index.vue
@ -17,14 +17,7 @@
        </a-layout-sider>
      </div>
      <div class="right">
-        <div
-          class="title"
-          v-if="
-            !(whoShow1 && whoShow1.itShowXiHaiAn && detailsType === '应用资源')
-          "
-        >
-          数据需求
-        </div>
+        <!-- <div class="title">数据需求</div> -->
        <a-list
          class="demo-loadmore-list"
          :loading="initLoading"
--- a/front/src/views/detailsAll/ApplicationDetails.vue
+++ b/front/src/views/detailsAll/ApplicationDetails.vue
@ -45,6 +45,12 @@
      id="function-introduction"
      class="scrollBox"
    ></application-function-intorduction>
+    <!--应用详情-->
+    <application-ability-trial
+      :dataList="dataList.data"
+      id="application-ability-trial"
+      class="scrollBox"
+    ></application-ability-trial>
    <!-- 使用能力 -->
    <application-ability-toise
      :dataList="dataList.data"
@ -81,6 +87,7 @@
  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 { ref, onMounted, onBeforeUnmount, reactive } from 'vue'
  import { useRouter } from 'vue-router'
--- a/front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue
@ -0,0 +1,179 @@
+<!--
+ * @Author: hisense.liangjunhua
+ * @Date: 2022-06-09 09:29:29
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-06-13 15:21:26
+ * @Description: 应用详情
+-->
+<template>
+  <div class="algorithm-on-trial" v-if="true">
+    <detals-title title="应用详情" type="PROBATION"></detals-title>
+    <div class="main">
+      <div class="main-left">
+        <p>{{ dataFrom.linkName }}</p>
+        <p style="cursor: pointer" @click="clickLink(dataFrom.link)">
+          {{ dataFrom.link }}
+        </p>
+      </div>
+      <div class="main-center">
+        <p>{{ dataFrom.numberName }}</p>
+        <p>{{ dataFrom.number }}</p>
+        <div @click="copyFunction(dataFrom.number, '复制账号')">复制账号</div>
+      </div>
+      <div class="main-right">
+        <p>{{ dataFrom.passwordName }}</p>
+        <p>{{ dataFrom.password }}</p>
+        <div @click="copyFunction(dataFrom.password2, '复制密码')">
+          复制密码
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script setup>
+  import DetalsTitle from '@/views/detailsAll/components/DetalsTitle.vue'
+  import { ref, defineProps, watch } from 'vue'
+  import { message } from 'ant-design-vue'
+  let flag = ref(true)
+  const props = defineProps({
+    dataList: { type: Object, default: null },
+  })
+  const dataFrom = ref({
+    linkName: '访问地址',
+    link: 'http://localhost:8080/#/detailsfdddffffffffffffffdfgdfgdfdgdfgdfg',
+    numberName: '试用账号',
+    number: 'zhangfeihu',
+    passwordName: '试用密码',
+    password: '**************************',
+    password2: '',
+  })
+  if (props.dataList.infoList) {
+    let obj = props.dataList.applyState
+    if (obj !== '已申请') {
+      flag.value = false
+    } else {
+      props.dataList.infoList.map((item) => {
+        if (item.attrType == '访问地址') {
+          dataFrom.value.link = item.attrValue
+        } else if (item.attrType == '试用用户名') {
+          dataFrom.value.number = item.attrValue
+        } else if (item.attrType == '试用密码') {
+          dataFrom.value.password2 = item.attrValue
+        }
+      })
+    }
+  }
+  const clickLink = (link) => {
+    window.open(link)
+  }
+  //复制方法
+  const copyFunction = (data, name) => {
+    let url = data
+    let oInput = document.createElement('input')
+    oInput.value = url
+    document.body.appendChild(oInput)
+    oInput.select() // 选择对象;
+    console.log(oInput.value)
+    document.execCommand('Copy') // 执行浏览器复制命令
+    oInput.remove() // 执行浏览器复制命令
+    message.success(name + '成功')
+  }
+  message.config({
+    top: '100px', // 距离顶部的位置
+  })
+  // const success = () => {
+  //   message.success({
+  //     // content: 'This is a prompt message with custom className and style',
+  //     className: 'custom-class',
+  //     style: {},
+  //   })
+  // }
+  watch(
+    () => props.dataList,
+    (val) => {
+      if (val) {
+        let obj = props.dataList.applyState
+        if (obj !== '已申请') {
+          flag.value = false
+        } else {
+          props.dataList.infoList.map((item) => {
+            if (item.attrType == '访问地址') {
+              dataFrom.value.link = item.attrValue
+            } else if (item.attrType == '试用用户名') {
+              dataFrom.value.number = item.attrValue
+            } else if (item.attrType == '试用密码') {
+              dataFrom.value.password2 = item.attrValue
+            }
+          })
+        }
+      }
+    }
+  )
+</script>
+<style lang="less" scoped>
+  .algorithm-on-trial {
+    padding: 0.8rem 0px 0.8rem;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    .main {
+      margin-top: 0.3rem;
+      width: 13rem;
+      height: 2.5rem;
+      background: url('~@/assets/detailsAll/kfzj_sybg.png') no-repeat;
+      display: grid;
+      grid-template-columns: 33.33% 33.33% 33.33%;
+      align-items: center;
+      .main-left {
+        border-right: 0.01rem #ffffff solid;
+        padding-left: 0.7rem;
+        padding-right: 1rem;
+        & > p {
+          overflow: hidden;
+          text-overflow: ellipsis;
+          display: -webkit-box;
+          -webkit-line-clamp: 2;
+          -webkit-box-orient: vertical;
+        }
+      }
+      .main-center {
+        padding-left: 1rem;
+        padding-right: 1rem;
+      }
+      .main-right {
+        padding-right: 0.7rem;
+      }
+      & > div > p:first-child {
+        font-size: 0.26rem;
+        color: #ffffff;
+        font-weight: bold;
+      }
+      & > div > p:nth-child(2) {
+        font-size: 0.22rem;
+        color: #ffffff;
+        line-height: 0.34rem;
+      }
+      & > div:first-child > p:last-child {
+        text-decoration: underline;
+        word-wrap: break-word;
+        word-break: normal;
+      }
+      & > div > div:last-child {
+        height: 0.34rem;
+        width: 1.1rem;
+        border: 0.01rem solid #ffffff;
+        border-radius: 0.06rem;
+        font-size: 0.18rem;
+        color: #ffffff;
+        cursor: pointer;
+        text-align: center;
+        line-height: 0.34rem;
+      }
+    }
+  }
+</style>
+<style>
+  .custom-class {
+    /* top: 100px; */
+  }
+</style>
--- a/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue
@ -75,13 +75,14 @@
          attrValue: '是',
        }
        dataFrom.value.content[1].childrenContent.push(isAndNo)
-      } else if (item.attrType === '访问地址') {
-        let obj = {
-          attrType: '访问地址',
-          attrValue: item.attrValue || '------',
-        }
-        dataFrom.value.content[0].childrenContent.push(obj)
      }
+      // } else if (item.attrType === '访问地址') {
+      //   let obj = {
+      //     attrType: '访问地址',
+      //     attrValue: item.attrValue || '------',
+      //   }
+      //   dataFrom.value.content[0].childrenContent.push(obj)
+      // }
    })
    if (dataFrom.value.content[1].childrenContent.length <= 0) {
      let data = [
@ -99,12 +100,12 @@
      })
    }
  }
-  //访问地址跳转方法
-  const addressFunction = (name, itemValue) => {
-    if (name == '访问地址') {
-      window.open(itemValue)
-    }
-  }
+  // //访问地址跳转方法
+  // const addressFunction = (name, itemValue) => {
+  //   if (name == '访问地址') {
+  //     window.open(itemValue)
+  //   }
+  // }
  watch(
    () => props.dataList,
    (val) => {
@ -125,13 +126,14 @@
              attrValue: '是',
            }
            dataFrom.value.content[1].childrenContent.push(isAndNo)
-          } else if (item.attrType === '访问地址') {
-            let obj = {
-              attrType: '访问地址',
-              attrValue: item.attrValue || '------',
-            }
-            dataFrom.value.content[0].childrenContent.push(obj)
          }
+          // } else if (item.attrType === '访问地址') {
+          //   let obj = {
+          //     attrType: '访问地址',
+          //     attrValue: item.attrValue || '------',
+          //   }
+          //   dataFrom.value.content[0].childrenContent.push(obj)
+          // }
        })
        if (dataFrom.value.content[1].childrenContent.length <= 0) {
          debugger
--- a/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue
@ -41,6 +41,10 @@
      name: '使用能力',
      key: 'ability-to-use',
    },
+    {
+      name: '应用详情',
+      key: 'application-ability-trial',
+    },
    {
      name: '部署与安全',
      key: 'deployment-and-security',
@ -96,6 +100,8 @@
        list.value.push(item.attrType)
      } else if (item.attrType === '应用展示视频') {
        list.value.push('应用展示')
+      } else if (item.attrType === '访问地址') {
+        list.value.push('应用详情')
      }
    })
    list.value.unshift('关联组件')
@ -137,6 +143,8 @@
            list.value.push(item.attrType)
          } else if (item.attrType === '应用展示视频') {
            list.value.push('应用展示')
+          } else if (item.attrType === '访问地址') {
+            list.value.push('应用详情')
          }
        })
        list.value.unshift('关联组件')
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@ -7,7 +7,8 @@
    ]"
  >
    <div class="name">
-      <div class="name-bg"></div>
+      <div class="name-bg" v-if="!whoShow1.itShowXiHaiAn"></div>
+      <div class="name-bg-xihaian" v-else></div>
      城市云脑通用能力服务平台
    </div>
    <div
@ -137,6 +138,7 @@
  //   // { name: '后台管理', key: 'houtaiguanli' },
  //   { name: '赋能案例', key: 'assignCase' },
  // ])
+  const whoShow1 = whoShow
  const user = ref({
    username: store.getters['user/username'],
  })
@ -353,6 +355,14 @@
        background-size: 100%;
        margin-right: 0.15rem;
      }
+      .name-bg-xihaian {
+        height: 0.6rem;
+        width: 0.6rem;
+        background: url('~@/assets/newHome/newHome-title-bg-xihaian.png')
+          no-repeat;
+        background-size: 100%;
+        margin-right: 0.15rem;
+      }
    }
    .nav {
      width: 1.2rem;