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

back/src/views/modules/activiti/demo/abilitydemandapply.vue

@@ -248,7 +248,6 @@ export default {
     
         this.dataForm.taskId = this.$route.params.taskId
         if (type === '同意') {
-          debugger
           // if (this.input !== '') {
           console.log('this.dataForm', this.dataForm)
           const params = qs.stringify({
@@ -267,6 +266,7 @@ export default {
                 return
               }
               bus.$emit('applicationforRequirementsInit')
+              bus.$emit('workInit')
               this.$message({
                 message: this.$t('prompt.success'),
                 type: 'success',
@@ -302,6 +302,7 @@ export default {
                   return
                 }
                 bus.$emit('applicationforRequirementsInit')
+                bus.$emit('workInit')
                 this.$message({
                   message: this.$t('prompt.success'),
                   type: 'success',

back/src/views/modules/activiti/demo/comments.vue

@@ -174,7 +174,8 @@ export default {
                 }
                 return
               }
-              bus.$emit('AbilityResourcesRemovedInit')
+              bus.$emit('commentInit')
+              bus.$emit('workInit')
               this.$message({
                 message: this.$t('prompt.success'),
                 type: 'success',
@@ -209,7 +210,8 @@ export default {
                   }
                   return
                 }
-                bus.$emit('AbilityResourcesRemovedInit')
+                bus.$emit('commentInit')
+                bus.$emit('workInit')
                 this.$message({
                   message: this.$t('prompt.success'),
                   type: 'success',
@@ -259,20 +261,7 @@ export default {
     }
   },
   created () {
-    // this.dataForm = this.$router.currentRoute.params.id
     this.init()
-    console.log('fromList', this.$router.currentRoute.params.businessKey)
-    // this.dataForm = this.$router.currentRoute.params.params.params.resourceDTO
-    var callbacks = {
-      startProcessSuccessCallback: this.closeCurrentTab,
-      startProcessErrorCallback: this.startProcessErrorCallback,
-      taskHandleSuccessCallback: this.closeCurrentTab,
-      taskHandleErrorCallback: this.taskHandleErrorCallback,
-      formSaveSuccessCallback: null,
-      formSaveErrorCallback: null
-    }
-    // 初始化综合组件
-    this.initProcessMultiple(callbacks)
     this.taskId = this.$route.params.taskId
     this.dataForm.taskId = this.$route.params.taskId
   },

back/src/views/modules/activiti/demo/putaway-process3.vue

@@ -252,6 +252,7 @@ export default {
                 return
               }
               bus.$emit('AbilityResourcesRemovedInit')
+              bus.$emit('workInit')
               this.$message({
                 message: this.$t('prompt.success'),
                 type: 'success',
@@ -287,6 +288,7 @@ export default {
                   return
                 }
                 bus.$emit('AbilityResourcesRemovedInit')
+                bus.$emit('workInit')
                 this.$message({
                   message: this.$t('prompt.success'),
                   type: 'success',

back/src/views/modules/myAgent/CommentModeration.vue

@@ -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 {
@@ -150,6 +151,14 @@ export default {
     }
   },
   components: {},
+  created () {
+    bus.$off('commentInit')
+    bus.$on('commentInit', () => {
+      debugger
+      this.getDataList()
+      bus.$emit('updateTaskNum')
+    })
+  },
   methods: {
     // 处理
     taskHandle (row) {

back/src/views/modules/myAgent/demo/ability-resource-shelf.vue

@@ -269,6 +269,7 @@ export default {
                 return
               }
               bus.$emit('abilityResourceShelfInit')
+              bus.$emit('workInit')
               this.$message({
                 message: this.$t('prompt.success'),
                 type: 'success',
@@ -306,6 +307,7 @@ export default {
                   return
                 }
                 bus.$emit('abilityResourceShelfInit')
+                bus.$emit('workInit')
                 this.$message({
                   message: this.$t('prompt.success'),
                   type: 'success',

back/src/views/modules/myAgent/demo/competency-application.vue

@@ -443,6 +443,7 @@ export default {
                 return
               }
               bus.$emit('competencyApplicationInit')
+              bus.$emit('workInit')
               this.$message({
                 message: this.$t('prompt.success'),
                 type: 'success',
@@ -478,6 +479,7 @@ export default {
                   return
                 }
                 bus.$emit('competencyApplicationInit')
+                bus.$emit('workInit')
                 this.$message({
                   message: this.$t('prompt.success'),
                   type: 'success',

back/src/views/modules/workBench/workBench.vue

@@ -35,7 +35,7 @@ import CenterView from '../workBench/components/center-view.vue'
 import DeptChartView from '../workBench/components/dept-chart-view.vue'
 import deptTodoView from '../workBench/components/dept-todo-view.vue'
 import * as Apis from './api.js'
-
+import bus from '@/views/bus.js'
 export default {
   components: {
     deptTodoView,
@@ -87,6 +87,14 @@ export default {
       loadingRequire: false
     }
   },
+  created () {
+    bus.$off('workInit')
+    bus.$on('workInit', () => {
+      console.log("刷新工作台===================")
+      this.getToDo()
+      this.getHasToDo()
+    })
+  },
   mounted () {
     // 部门待办
     this.getToDo()

front/src/views/assertReport/components/ReservoirRight.vue

@@ -44,7 +44,7 @@
             <div class="left-list1">排行</div>
             <div class="left-list2">部门名称</div>
             <div class="left-list1">应用数</div>
-            <div class="left-list1" style="color: #1ffefd">贡献金额</div>
+            <div class="left-list1" style="color: #1ffefd">节省金额</div>
           </div>
           <div style="    height: 1.7rem; overflow-y: auto;overflow-x: hidden;width: 100%;">
           <div class="left-list" v-for="(item, index) in top5DeptFundList">
@@ -105,7 +105,7 @@
             <div class="left-list1">序号</div>
             <div class="left-list2">部门名称</div>
             <div class="left-list1">应用数</div>
-            <div class="left-list1" style="color: #1ffefd">贡献金额</div>
+            <div class="left-list1" style="color: #1ffefd">节省金额</div>
           </div>
           <div style="height: 200px; overfolw-y: auto">
             <div

front/src/views/assertReport/index.vue

@@ -160,7 +160,7 @@
       height: 1.8rem;
     }
     .header1 {
-      top: 78px;
+      top: 70px;
       position: absolute;
       left: 795px;
       align-items: center;

front/src/views/demandCenter/index.vue

@@ -28,8 +28,8 @@
           <template #renderItem="{ item }">
             <a-list-item>
               <div class="toptitle">
-                <a-tooltip placement="topLeft">
-                  <template #title>{{ item.demandSubject }}</template>
+                <a-tooltip placement="topLeft" v-if="item.demandSubject.length>20">
+                  <template #title>{{ item.demandSubject}}</template>
                   <span
                     @click="showDetail(item)"
                     style="cursor: pointer"
@@ -38,15 +38,19 @@
                     {{ item.demandSubject }}
                   </span>
                 </a-tooltip>
-
+                <span v-else>
+                  {{ item.demandSubject }}
+                </span>
                 <span class="time">{{ item.createDate }}</span>
               </div>
-              <a-tooltip placement="topLeft">
-                <template #title>描述： {{ item.demandDetails }}</template>
-                <div class="bottomdesc">
+             
+                <div class="bottomdesc" v-if="item.demandDetails.length<100">
                   描述： {{ item.demandDetails || '--' }}
                 </div>
-              </a-tooltip>
+                <div class="bottomdesc" v-else>
+                  描述： {{ item.demandDetails.slice(0,100) }}...<span style="cursor:pointer;color:#1492ff" @click="showDetail(item)">查看更多>></span>
+                </div>
+             
             </a-list-item>
           </template>
         </a-list>
@@ -194,6 +198,7 @@ onMounted(() => {
 })
 </script>
 <style lang="less" scoped>
+
 .main-cont {
   margin-top: 64px;
   width: 100%;
@@ -260,6 +265,7 @@ onMounted(() => {
       box-shadow: 10px 8px 10px 3px #9dc6ea;
       padding: 20px;
       .toptitle {
+        cursor: pointer;
         margin-bottom: 10px;
         & > span:first-child {
           display: -webkit-box;
@@ -287,7 +293,7 @@ onMounted(() => {
       .bottomdesc {
         display: -webkit-box;
         /*设置为弹性盒子*/
-        -webkit-line-clamp: 1;
+        -webkit-line-clamp: 2;
         /*最多显示2行*/
         overflow: hidden;
         /*超出隐藏*/

front/src/views/home/components/ApplicationTopDetails.vue

@@ -9,13 +9,13 @@
   <div class="algorithm-top-details">
     <div class="left">
       <div class="top">
-        <a-tooltip placement="top">
+        <a-tooltip placement="top" v-if="(props.dataList.name.length>20)">
           <template #title>{{ props.dataList.name }}</template>
           <span class="name">
             {{ props.dataList.name }}
           </span>
         </a-tooltip>
-        <!-- <span class="name">{{ props.dataList.name }}</span> -->
+        <span class="name" v-else>{{ props.dataList.name }}</span>
         <div class="label-content">
           <p class="lable-father">
             <span class="label" v-if="props.dataList.type">
@@ -27,28 +27,54 @@
             <span class="label" v-if="props.dataList.shareCondition">
               {{ props.dataList.shareCondition }}
             </span>
-           
           </p>
-         
         </div>
         <!-- <span class="label">免费</span> -->
-         
       </div>
       <div class="main">
         <!-- <a-tooltip placement="top">
           <template #title>应用领域：{{ applicationArea }}</template>
           <div>应用领域：{{ applicationArea }}</div>
         </a-tooltip> -->
-        <a-tooltip placement="top">
+        <!-- <a-tooltip placement="top">
           <template #title>{{ props.dataList.description }}</template>
           <div>
             {{ props.dataList.description }}
           </div>
-        </a-tooltip>
-        <div style="padding-top:20px">
-        <span >场景入口:</span>
-        <span style="margin-left:10px;cursor: pointer; text-decoration: underline;" 
-        @click="openScene(props.dataList.sceneUrl)">{{(props.dataList.sceneUrl)}}</span>
+        </a-tooltip> -->
+        <div class="bottomdesc" v-if="props.dataList.description.length < 200">
+          场景描述： {{ props.dataList.description || '--' }}
+        </div>
+        <div class="bottomdesc" v-else-if="dowmOrUp === '展开>>'">
+          场景描述： {{ props.dataList.description.slice(0, 200) }}...
+          <span
+            style="cursor: pointer; color: rgb(241 211 112)"
+            @click="showDetail(dowmOrUp)"
+          >
+            {{ dowmOrUp }}
+          </span>
+        </div>
+        <div class="bottomdesc1" v-else>
+          场景描述： {{ props.dataList.description }}
+          <span
+            style="cursor: pointer; color: rgb(241 211 112)"
+            @click="showDetail(dowmOrUp)"
+          >
+            {{ dowmOrUp }}
+          </span>
+        </div>
+        <div style="padding-top: 20px">
+          <span>场景入口:</span>
+          <span
+            style="
+              margin-left: 10px;
+              cursor: pointer;
+              text-decoration: underline;
+            "
+            @click="openScene(props.dataList.sceneUrl)"
+          >
+            {{ props.dataList.sceneUrl }}
+          </span>
         </div>
       </div>
       <div class="bottom" v-if="props.dataList.id">
@@ -80,30 +106,38 @@
         </a-button> -->
       </div>
     </div>
-    <div class="right">
-    
-    </div>
+    <div class="right"></div>
   </div>
 </template>
 <script setup>
-  // 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'
-  // 获取当前路由地址
-  const router = useRouter()
+// 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'
+// 获取当前路由地址
+const router = useRouter()
 
-  const props = defineProps({
+let dowmOrUp = ref('展开>>') //展开 down ; 收起 up
+
+//文字展开或收起
+const showDetail = (val) => {
+  if (val === '展开>>') {
+    dowmOrUp.value = '收起<<'
+  } else {
+    dowmOrUp.value = '展开>>'
+  }
+}
+const props = defineProps({
   dataList: { type: Object, default: null },
-  })
+})
 
-  console.log('dataList------------>', props.dataList)
-  const applicationArea = ref('')
-  // // 加入申购车
-  const addShoppingCart = () => {
+console.log('dataList------------>', props.dataList)
+const applicationArea = ref('')
+// // 加入申购车
+const addShoppingCart = () => {
   if (props.dataList.isInShoppingCart) {
     message.error('已经加入申购车了')
   } else {
@@ -123,13 +157,13 @@
       )
     })
   }
-  }
-    //进入场景入口
-    const openScene = (val) => {
-      window.open(val, "_blank");
-  }
-  // // 立即申请
-  function toView() {
+}
+//进入场景入口
+const openScene = (val) => {
+  window.open(val, '_blank')
+}
+// // 立即申请
+function toView() {
   // window.open(newpage.href, '_blank')
   // router.push({
   //   path: '/apply',
@@ -162,9 +196,9 @@
   router.push({
     path: '/apply',
   })
-  }
-  // 融合服务--一键申请
-  const handleAKeyApplication = () => {
+}
+// 融合服务--一键申请
+const handleAKeyApplication = () => {
   let _applyList = []
   ;(props.dataList.fuseResourceList || []).map((v) => {
     let resource = v.resource || {}
@@ -189,11 +223,11 @@
   router.push({
     path: '/apply',
   })
-  }
+}
 
-  // 收藏
-  const scFlag2 = ref(true)
-  const goTOCollection = () => {
+// 收藏
+const scFlag2 = ref(true)
+const goTOCollection = () => {
   console.log('收藏===================》', props.dataList)
   if (scFlag2.value) {
     scFlag2.value = false
@@ -225,13 +259,13 @@
   //   console.log(res)
   //   message.success('收藏成功')
   // })
-  }
-  if (props.dataList.infoList) {
+}
+if (props.dataList.infoList) {
   applicationArea.value = props.dataList.infoList.filter(
     (val) => val.attrType === '应用领域'
   )[0].attrValue
-  }
-  watch(
+}
+watch(
   () => props.dataList,
   (val) => {
     if (val) {
@@ -242,10 +276,10 @@
       )[0].attrValue
     }
   }
-  )
+)
 </script>
 <style lang="less" scoped>
-  .algorithm-top-details {
+.algorithm-top-details {
   height: 6rem;
   padding: 1.8rem 0 0;
   background: url('~@/assets/detailsAll/sf_top_bg.png') no-repeat;
@@ -305,25 +339,29 @@
     }
 
     .main {
+      .bottomdesc {
+        display: -webkit-box;
+        /*设置为弹性盒子*/
+        -webkit-line-clamp: 4;
+        /*最多显示2行*/
+        overflow: hidden;
+        /*超出隐藏*/
+        text-overflow: ellipsis;
+        /*超出显示为省略号*/
+        -webkit-box-orient: vertical;
+        word-break: break-all;
+        width: 800px;
+        font-size: 14px;
+      }
+      .bottomdesc1 {
+        overflow: auto;
+        width: 800px;
+        font-size: 14px;
+        height: 200px;
+      }
       margin-top: 0.2rem;
       font-size: 0.18rem;
       line-height: 0.34rem;
-
-        // & > div:nth-of-type(1) {
-        //   overflow: hidden;
-        //   text-overflow: ellipsis;
-        //   white-space: nowrap;
-        // }
-
-        & > div:nth-of-type(1) {
-          max-height: 1rem;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          display: -webkit-box;
-          -webkit-line-clamp: 3;
-          -webkit-box-orient: vertical;
-          word-break: break-all;
-        }
     }
 
     .bottom {
@@ -362,5 +400,5 @@
     background-size: 100%;
     margin-top: -0.4rem;
   }
-  }
+}
 </style>

front/src/views/home/components/header.vue

@@ -420,7 +420,7 @@
     })
 
     mybus.on('changeMenuStyle', (data) => {
-      debugger
+
       targetRouter.value = data
       if (data.path == '/algorithmCompare') {
         jumpPage(

front/src/views/home/integrationServices.vue

@@ -31,9 +31,11 @@
           />
             <i  class="searchImg" aria-hidden="true"></i>
           <button class="button-reset" @click="resetAction()">重置</button>
+        
           <div class="hengxian"></div>
         </div>
       </div>
+      <div v-if="number === 0" class="checkResult">检测结果: <span>{{resourceTotal}}</span>个</div>
       <div v-loading="loadingData">
         <searchResultList
           v-if="number === 1"
@@ -52,7 +54,9 @@
           :resourceTotal="resourceTotal"
           :selectCardsname="number == 0 ? '融合服务' : '赋能场景'"
         />
+     
         <div class="pagination">
+       
           <a-pagination
             v-if="resourceList.data && resourceList.data.length > 0"
             v-model:current="currentPage"
@@ -330,9 +334,22 @@
   })
 </script>
 <style lang="less" scoped>
+.checkResult{
+  margin-left: 0.2rem;
+    font-size: 14px;
+    font-weight: 500;
+    color: #212121;
+    margin-top: 10px;
+
+        span {
+          font-size: 18px;
+          color: #0087ff;
+        }
+
+}
   .resultListSearchInput-father {
     background: #f3f5f9;
-    padding: 0.2rem;
+    padding: 0rem 0.2rem;
 
     .resultListSearchInput-son {
       background: #fff;

front/src/views/personalCenter/components/addApplication.vue

@@ -347,6 +347,8 @@
           message.success(`${info.file.name} 文件上传成功`)
           formName.enclosure = info.file.response.data
         } else if (info.file.status === 'error') {
+          formName.enclosure = ''
+          fileList.value=[]
           message.error(`${info.file.name} 文件上传失败`)
         }
       }