Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev

back/src/views/modules/workBench/components/content-title.vue

@@ -1,16 +1,16 @@
 <template>
   <div class="content-title">
-    <div>
+    <div>{{ title }}</div>
-      {{ title }}
+    <slot></slot>
-    </div>
   </div>
 </template>
 
 <script>
+import contentTitle from "./content-title";
 export default {
   name: "contentTitle",
   props: {
-    title: String,
+    title: String
   },
 };
 </script>
@@ -20,8 +20,9 @@ export default {
   height: 48px;
   line-height: 48px;
   font-size: 18px;
-  font-weight: bold;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;;
   // color: #fff;
-
 }
 </style>

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

@@ -45,14 +45,14 @@ export default {
         },
         {
           title: "当前申请数",
-          key: "activityName",
+          key: "applyCount",
-          dataIndex: "activityName",
+          dataIndex: "applyCount",
           width: 115
         },
         {
           title: "调用数量",
-          key: "activityName",
+          key: "visit",
-          dataIndex: "activityName",
+          dataIndex: "visit",
           width: 90
         }
       ],
@@ -78,9 +78,7 @@ export default {
           if (res.data.code !== 0) {
             return;
           }
-          this.data = res.data.data.records || [];
+          this.data = res.data.data.list || [];
-          console.log('this.data------------>', this.data);
-          
         },
         err => {
           console.log("err", err);