更新代码

src/components/Activity/ActivityDate.vue

@@ -13,34 +13,15 @@
           <span>{{ index + 1 }}</span>
         </template>
 
-        <template slot="type" slot-scope="text, record">
-          <a-tag color="blue">{{ record.type }}</a-tag>
-        </template>
-
-        <template slot="time" slot-scope="text, record">
-          <div v-if="record.realTime">{{ record.realTime }}</div>
-          <div v-else>{{ record.planTime }}</div>
-        </template>
-
-        <template slot="state" slot-scope="text, record">
-          <a-tag color="green">{{ record.state }}</a-tag>
-        </template>
-
         <template slot="edit" slot-scope="text, record">
           <a-icon @click="showEditModal(record)" class="pointer" theme="twoTone" type="edit" />
           <a-popconfirm @confirm="() => onDelete(record.id)" title="确定要删除这一条?" v-if="lists.length">
             <a-icon class="ml-4 pointer" theme="twoTone" two-tone-color="#ff0000" type="delete" />
           </a-popconfirm>
-          <a-button @click="openSignUp" class="ml-4" size="small" type="primary">报名</a-button>
         </template>
 
         <div slot="expandedRowRender" slot-scope="record" style="margin: 0">
-          <div class="d-flex flex-nowrap justify-space-between mb-2">
-            <div>计划时间：{{ record.planTime }}</div>
-            <div class="ml-8">实际时间：{{ record.realTime }}</div>
-            <div class="ml-8">组织人：{{ record.organizer }}</div>
-          </div>
-          <div>活动内容：{{ record.content }}</div>
+          <div>详情：{{ record.content }}</div>
         </div>
       </a-table>
     </div>
@@ -64,44 +45,34 @@ const columns = [
     scopedSlots: { customRender: 'id' },
   },
   {
-    title: '发布平台',
+    title: '标题',
     align: 'center',
-    dataIndex: 'plat',
-    key: 'plat',
+    dataIndex: 'title',
+    key: 'title',
   },
   {
-    title: '类型',
+    title: '简介',
     align: 'center',
-    dataIndex: 'type',
-    key: 'type',
-    scopedSlots: { customRender: 'type' },
-  },
-  {
-    title: '举办时间',
-    align: 'center',
-    dataIndex: 'time',
-    key: 'time',
-    scopedSlots: { customRender: 'time' },
+    dataIndex: 'description',
+    key: 'description',
   },
   {
     title: '地点',
     align: 'center',
-    dataIndex: 'place',
-    key: 'place',
-    scopedSlots: { customRender: 'place' },
+    dataIndex: 'site',
+    key: 'site',
   },
   {
-    title: '主讲人',
+    title: '发布部门',
     align: 'center',
-    dataIndex: 'speaker',
-    key: 'speaker',
+    dataIndex: 'spreadDepartment',
+    key: 'spreadDepartment',
   },
   {
-    title: '发布状态',
+    title: '时间',
     align: 'center',
-    dataIndex: 'state',
-    key: 'state',
-    scopedSlots: { customRender: 'state' },
+    dataIndex: 'time',
+    key: 'time',
   },
   {
     title: '编辑',
@@ -113,45 +84,19 @@ const columns = [
   },
 ];
 
-const lists = [
-  {
-    id:'001',
-    plat:'传控科技',
-    type: '路演',
-    planTime: '2020/11/17 08:00 - 2020/11/18 19:00',
-    realTime:'2020/11/17 08:00 - 2020/11/18 19:00',
-    place:'太原',
-    organizer: '张三',
-    speaker: '李四',
-    state: '发布',
-    content:'团队简介团队简介团队简介团队简介团队简介团队简介团队简介团队简介团队简介团队简介团队简介团队简介团队简介团队简介团队简介团队简介'
-  },
-  {
-    id:'002',
-    plat:'中绿环保',
-    type: '路演',
-    planTime: '2020/11/17 08:00 - 2020/11/18 19:00',
-    realTime:'2020/11/17 08:00 - 2020/11/18 19:00',
-    place:'太原',
-    organizer: '张三',
-    speaker: '李四',
-    state: '不发布',
-    content:'团队简介团队简介团队简介团队简介团队简介团队简介团队简介团队简介团队简介团队简介团队简介团队简介团队简介团队简介团队简介团队简介'
-  }
-];
-
 export default {
   name: "ActivityDate",
   components: {
     ActivityEdit,
   },
+
+  props: { lists: { type: Array, default: () => [] } },
+
   data() {
-    this.cacheData = lists.map(item => ({ ...item }));
+    this.cacheData = this.lists.map(item => ({ ...item }));
     return {
       columns,
-      lists,
       loading: false,
-      editingKey: '',
       height: '',
       editVisible: false,
       editItem: null, // 修改的那条

src/config/api.js

@@ -9,6 +9,8 @@ let { proxyUrl, msgUrl } = require('@/config/setting');
 const greenvalley = `${proxyUrl}/greenvalley`;
 const researchTeam = `${greenvalley}/researchTeam`; // 创新平台相关操作
 const page = `${greenvalley}/page`; // 页面管理相关操作
+const industryInfo = `${greenvalley}/industryInfo`; // 行业资讯相关操作
+
 
 // websocket基础地址
 export const WS_BASE_URL = msgUrl;
@@ -25,6 +27,9 @@ export const deletePage = params => axios.post(`${page}/delete`, params);
 // 页面配置修改
 export const updatePage = params => axios.post(`${page}/update`, params);
 
+// 行业资讯列表查询
+export const getBackendSearch = params => axios.post(`${industryInfo}/backendSearch`, params);
+
 // 查询所有的研发团队相关信息
 export const getAllTeam = () => axios.post(`${researchTeam}/selectAllTeam`);
 

src/views/IndustryInfo/IndustryInfo.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="pa-3 white fill-height d-flex flex-column">
     <activity-search />
-    <activity-date />
+    <activity-date :lists="lists" />
   </div>
 </template>
 
 <script>
 import ActivitySearch from "components/Activity/ActivitySearch.vue";
 import ActivityDate from "components/Activity/ActivityDate.vue";
-// import { getSelectTeam } from 'config/api';
+import { getBackendSearch } from 'config/api';
 
 export default {
   name: "ActivityBulletin",
@@ -17,8 +17,14 @@ export default {
     ActivityDate,
   },
 
+  data() {
+    return {
+      lists: []
+    };
+  },
+
   created() {
-    // this.getSelectTeam()
+    this.getBackendSearch()
   },
 
   methods: {
@@ -26,12 +32,17 @@ export default {
      * 根据团队id查看研发团队相关信息
      * @param { String } competeTimeId 第几届信息的id
      */
-    async getSelectTeam() {
+    async getBackendSearch() {
       try {
-        const params = {param:{}}
-        const res = await getSelectTeam(params);
+        const params = {param:{
+          pageNum: 1,
+          pageSize: 10
+        }}
+        const res = await getBackendSearch(params);
         const { code, msg, data } = res.data;
         if (code === 200) {
+          console.log(data)
+          this.lists = data.list
         } else {
           throw msg || '获取失败';
         }