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

back/src/mixins/view-module.js

@@ -71,6 +71,7 @@ export default {
             return this.$message.error(res.msg)
           }
           this.dataList = this.mixinViewModuleOptions.getDataListIsPage ? res.data.list : res.data
+          if(!['/sys/notice/page','/sys/notice/mynotice/page'].includes(this.mixinViewModuleOptions.getDataListURL)){//我得通知、通知管理不需要特殊处理
             this.dataList.map((item, index) => {
               if (this.dataList[index].type != null) {
                 switch (item.type) {
@@ -91,6 +92,9 @@ export default {
                 })
               }
             })
+         
+          }
+         
           // 我的代办特殊处理
           if (this.mixinViewModuleOptions.getDataListURL === '/act/task/myToDoTaskPage') {
             this.$http.get('/sys/user/info').then(userRes => {

back/src/views/modules/bscatalogue/bscatalogue.vue

@@ -65,12 +65,12 @@
       </template>
     </cardDragger>
     <!-- 编辑卡片按钮 -->
-    <div v-show="isShowEdit" class="resource-manager-edit-card">
+    <div   @click.stop="editTopicCard" v-show="isShowEdit" class="resource-manager-edit-card">
       <div>
         <div />
       </div>
       <div>
-        <span @click.stop="editTopicCard">{{
+        <span>{{
           isRemoveCard ? '完成' : '编辑'
         }}</span>
       </div>

back/src/views/modules/notice/notice-user-view.vue

@@ -48,10 +48,12 @@ export default {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
+       
         this.dataForm = {
           ...this.dataForm,
           ...res.data
         }
+        console.log("========================this.dataForm",this.dataForm)
       }).catch(() => {})
     }
   }

back/src/views/modules/workBench/components/bottom-view.vue

@@ -3,7 +3,7 @@
     <!-- 部门发布动态 -->
     <div class="left container">
       <content-title :title="title.dynamic"></content-title>
-      <div class="dynamic-box" v-loading="loadingDynamic">
+      <div v-if="(list.length>0)" class="dynamic-box" v-loading="loadingDynamic">
         <div    class="dynamicView" v-for="(item, index) in list" :key="index" :number="index + 1" :item="item">
           <div class="wrapper">
             <div class="content">
@@ -16,6 +16,13 @@
         </div>
         <div class="more" @click="jumpTo">查看更多 ></div>
       </div>
+      <div
+      class="no-data"
+      v-else
+      style="display: flex; align-items: center; justify-content: center"
+    >
+      暂无数据
+    </div>
 
     </div>
     <!-- 部门推荐能力 -->
@@ -156,7 +163,14 @@ export default {
   box-sizing: border-box;
   display: flex;
   justify-content: space-between;
-
+  .no-data {
+    width: 800px;
+    height: 335px;
+    line-height: 335px;
+    font-size: 16px;
+    color: #212121;
+    text-align: center;
+}
   .container {
     background: #fff;
     width: 800px;

back/src/views/modules/workBench/components/trend-view.vue

@@ -68,7 +68,7 @@ export default {
         const valueItem = y + '-' + m + '-' + d // 组合
         days.unshift(valueItem) // 添加至数组
       }
-      console.log('最近七天日期：', days)
+   
 
       return days
     },
@@ -88,6 +88,7 @@ export default {
           endDate: this.endDate
         },
         (res) => {
+      
           // if (res.data.code !== 0) {
           //   return
           // }
@@ -124,7 +125,7 @@ export default {
     handleTitleSwitch (idx) {
       this.selectedTitle = idx
       this.startDate = this.getData(this.selectedTitle == 0 ? 7 : 30)
-      console.log(this.startDate)
+     
       this.initChart()
     },
     getData (aa) {

front/src/views/assertReport/index.vue

@@ -12,9 +12,10 @@
           <p v-if="item == '.'" :key="index">
             {{ item }}
           </p>
-          <span v-else>{{ item }}</span>
+          <span @click="jumpToPage" v-else>{{ item }}</span>
         </template>
-        <div class="mianJi">万元</div>
+        <div class="mianJi" >万元</div>
+        <!-- <div  stype="margin-left:10px" ><img src="./image/jump.png"/></div> -->
       </div>
       <div style="color: #bed1df; font-size: 16px">
         注：资源参考价格由部门提供或参考市场价格设定
@@ -50,6 +51,7 @@
   import ReservoirRight from './components/ReservoirRight'
   import ReservoirBottom from './components/ReservoirBottom'
   import { NumbersConvertedToArrays } from '@/utils/arrayMethod.js'
+  import Cookies from 'js-cookie'
   export default {
     //import引入的组件需要注入到对象中才能使用
     components: {
@@ -87,6 +89,11 @@
     watch: {},
     //方法集合
     methods: {
+      //跳转后台资金报表 详情
+      jumpToPage(){
+        Cookies.remove('JSESSIONID')
+          window.open(window.SITE_CONFIG.backUrl + '/#/assetReport-index')
+      },
       getSaveMoney() {
         getApplyPriceCount().then((res) => {
           this.saveMonmy = NumbersConvertedToArrays(res.data.data)
@@ -174,6 +181,7 @@
         color: #bed1df;
         margin-left: 100px;
         span {
+          cursor: pointer;
           width: 36px;
           // height: 45px;
           // line-height: 45px;
@@ -187,6 +195,10 @@
           margin-right: 3px;
 
           font-family: DinPro-Bold;
+          
+        }
+        span:hover{
+          color: #f2bc0a;
         }
         .mianJi {
           margin-top: 6px;

front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue

@@ -60,10 +60,10 @@
           申请使用
         </a-button>
         <a-button type="primary" @click="addShoppingCart()">
-          <template #icon>
+          <!-- <template #icon>
             <shopping-cart-outlined />
-          </template>
-          加入申购车
+          </template> -->
+          {{ props.dataList.isInShoppingCart ? '已' : '' }}加入申购车
         </a-button>
         <a-button type="primary" @click="goTOCollection()">
           {{ props.dataList.isCollect == 'true' ? '已' : '' }}收藏

front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue

@@ -64,8 +64,8 @@
           type="primary"
           @click="addShoppingCart()"
         >
-          <template #icon><shopping-cart-outlined /></template>
-          加入购物车
+          <!-- <template #icon><shopping-cart-outlined /></template> -->
+          {{ props.dataList.isInShoppingCart ? '已' : '' }}加入购物车
         </a-button>
         <a-button type="primary" @click="goTOCollection()">
           {{ props.dataList.isCollect == 'true' ? '已' : '' }}收藏

front/src/views/detailsAll/components/Business/BusinessTopDetails.vue

@@ -57,10 +57,10 @@
           申请使用
         </a-button>
         <a-button type="primary" @click="addShoppingCart()">
-          <template #icon>
+          <!-- <template #icon>
             <shopping-cart-outlined />
-          </template>
-          加入申购车
+          </template> -->
+          {{ props.dataList.isInShoppingCart ? '已' : '' }}加入申购车
         </a-button>
         <a-button type="primary" @click="goTOCollection()">
           {{ props.dataList.isCollect == 'true' ? '已' : '' }}收藏

front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue

@@ -55,8 +55,8 @@
           申请使用
         </a-button>
         <a-button type="primary" @click="addShoppingCart()">
-          <template #icon><shopping-cart-outlined /></template>
-          加入购物车
+          <!-- <template #icon><shopping-cart-outlined /></template> -->
+          {{ props.dataList.isInShoppingCart ? '已' : '' }}加入购物车
         </a-button>
         <a-button type="primary" @click="goTOCollection()">
           {{ props.dataList.isCollect == 'true' ? '已' : '' }}收藏

front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue

@@ -63,8 +63,8 @@
             ).length === 0
           "
         >
-          <template #icon><shopping-cart-outlined /></template>
-          加入申购车
+          <!-- <template #icon><shopping-cart-outlined /></template> -->
+          {{ props.dataList.isInShoppingCart ? '已' : '' }}加入申购车
         </a-button>
         <a-button type="primary" @click="goTOCollection()">
           {{ props.dataList.isCollect == 'true' ? '已' : '' }}收藏