Merge branch 'master' of dd.tall.wiki:song/green-valley-admin

src/components/BtnCom/BtnCon.vue

@@ -3,12 +3,12 @@
     <div class="font-bold-24">行政部</div>
     <div @click="jump('/page-manage')" class="btn">内容管理</div>
     <div @click="jump('/industry-info')" class="btn">行业资讯</div>
-    <div @click="jump('/talent-recruitment')" class="btn">人才招聘</div>
     <div @click="jump('/user-manage')" class="btn">用户管理</div>
     <div @click="jump('/banner-manage')" class="btn">轮播图管理</div>
     <div @click="jump('/communication-community')" class="btn">交流社区</div>
     <div @click="jump('/event-announcement')" class="btn">活动公告</div>
     <div @click="jump('/innovation-policy')" class="btn">创新政策</div>
+    <div @click="jump('/talent-recruitment')" class="btn">人才招聘</div>
 
     <div class="font-bold-24">创新部</div>
     <div @click="jump('/cooperation-intention')" class="btn">合作意向</div>

src/components/Page/PageDate.vue

@@ -26,6 +26,15 @@
             <a-icon class="ml-4 pointer" theme="twoTone" two-tone-color="#ff0000" type="delete" />
           </a-popconfirm>
         </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>-->
       </a-table>
     </div>
     <a-empty v-else />
@@ -108,7 +117,6 @@ export default {
     async closeModal() {
       this.editVisible = false;
       await this.$emit('getPageList');
-      console.log(555555555555);
     },
 
     handleTableChange(pagination) {
@@ -126,8 +134,6 @@ export default {
         if (code === 200) {
           this.$message.success('删除成功');
           await this.$emit('getPageList');
-          // const arr = [...this.lists];
-          // this.lists = arr.filter(item => item.id !== pageId);
         } else {
           throw msg;
         }