Merge branch 'master' of http://git.bjzxtw.org.cn:3000/zxt/admin_home

src/views/dashboard/admin/index.vue

@@ -13,56 +13,70 @@
                             <div class="topDataBoxTitleText">待审核列表</div>
                         </div>
                         <div class="topDataBoxList">
-                            <div class="topDataLi1">
-                                <div class="topDataMain">
-                                    <span @click="goToList(1)">待审核资讯</span>
-                                    <span @click="goToList(1)">{{ articleCount }}</span>
-                                </div>
-                                <div class="topDataMain">
-                                    <span @click="goToList(8)">待审核广告</span>
-                                    <span @click="goToList(8)">{{ adCount }}</span>
-                                </div>
-                            </div>
-                            <div class="topDataLi2">
-                                <div class="topDataMainCenter">
-                                    <span @click="goToList(2)">待审核商品</span>
-                                    <span @click="goToList(2)">{{ goodsCount }}</span>
-                                </div>
-                                <div class="topDataMainCenter">
-                                    <span @click="goToList(3)">待审核书刊音像</span>
-                                    <span @click="goToList(3)">{{ bookCount }}</span>
-                                </div>
-                            </div>
-                            <div class="topDataLi3">
-                                <div class="topDataMainCenter">
-                                    <span @click="goToList(4)">待审核招聘</span>
-                                    <span @click="goToList(4)">{{ jobRecruitingCount }}</span>
-                                </div>
-                                <div class="topDataMainCenter">
-                                    <span @click="goToList(5)">待审核求职</span>
-                                    <span @click="goToList(5)">{{ jobHuntingCount }}</span>
+                            <el-col :xs="24" :sm="24" :lg="4">
+                                <div class="topDataLi1">
+                                    <div class="topDataMain">
+                                        <span @click="goToList(1)">待审核资讯</span>
+                                        <span @click="goToList(1)">{{ articleCount }}</span>
+                                    </div>
+                                    <div class="topDataMain">
+                                        <span @click="goToList(8)">待审核广告</span>
+                                        <span @click="goToList(8)">{{ adCount }}</span>
+                                    </div>
                                 </div>
-                            </div>
-                            <div class="topDataLi4">
-                                <div class="topDataMain">
-                                    <span @click="goToList(6)">待审核行政通知</span>
-                                    <span @click="goToList(6)">{{ noticeCount }}</span>
+                            </el-col>
+                            <em class="topDataLine"></em>
+                            <el-col :xs="24" :sm="24" :lg="5">
+                                <div class="topDataLi2">
+                                    <div class="topDataMainCenter">
+                                        <span @click="goToList(2)">待审核商品</span>
+                                        <span @click="goToList(2)">{{ goodsCount }}</span>
+                                    </div>
+                                    <div class="topDataMainCenter">
+                                        <span @click="goToList(3)">待审核书刊音像</span>
+                                        <span @click="goToList(3)">{{ bookCount }}</span>
+                                    </div>
                                 </div>
-                                <div class="topDataMain">
-                                    <span @click="goToList(7)">待审核行政投诉</span>
-                                    <span @click="goToList(7)">{{ complaintCount }}</span>
+                            </el-col>
+                            <em class="topDataLine"></em>
+                            <el-col :xs="24" :sm="24" :lg="4">
+                                <div class="topDataLi3">
+                                    <div class="topDataMainCenter">
+                                        <span @click="goToList(4)">待审核招聘</span>
+                                        <span @click="goToList(4)">{{ jobRecruitingCount }}</span>
+                                    </div>
+                                    <div class="topDataMainCenter">
+                                        <span @click="goToList(5)">待审核求职</span>
+                                        <span @click="goToList(5)">{{ jobHuntingCount }}</span>
+                                    </div>
                                 </div>
-                            </div>
-                            <div class="topDataLi5">
-                                <div class="topDataMain">
-                                    <span @click="goToList(9)">待审核企业</span>
-                                    <span @click="goToList(9)">{{ complanyCount }}</span>
+                            </el-col>
+                            <em class="topDataLine"></em>
+                            <el-col :xs="24" :sm="24" :lg="5">
+                                <div class="topDataLi4">
+                                    <div class="topDataMain">
+                                        <span @click="goToList(6)">待审核行政通知</span>
+                                        <span @click="goToList(6)">{{ noticeCount }}</span>
+                                    </div>
+                                    <div class="topDataMain">
+                                        <span @click="goToList(7)">待审核行政投诉</span>
+                                        <span @click="goToList(7)">{{ complaintCount }}</span>
+                                    </div>
                                 </div>
-                                <div class="topDataMain">
-                                    <span @click="goToList(10)">待审核项目</span>
-                                    <span @click="goToList(10)">{{ projectCount }}</span>
+                            </el-col>
+                            <em class="topDataLine"></em>
+                            <el-col :xs="24" :sm="24" :lg="4">
+                                <div class="topDataLi5">
+                                    <div class="topDataMain">
+                                        <span @click="goToList(9)">待审核企业</span>
+                                        <span @click="goToList(9)">{{ complanyCount }}</span>
+                                    </div>
+                                    <div class="topDataMain">
+                                        <span @click="goToList(10)">待审核项目</span>
+                                        <span @click="goToList(10)">{{ projectCount }}</span>
+                                    </div>
                                 </div>
-                            </div>
+                            </el-col>
                         </div>
                     </div>
                 </el-col>
@@ -237,42 +251,53 @@
                             <div class="topDataBoxTitleText">待审核列表</div>
                         </div>
                         <div class="topDataBoxList">
-                            <div class="topDataLi1">
-                                <div class="topDataMain">
-                                    <span @click="goToList(1)">待审核资讯</span>
-                                    <span @click="goToList(1)">{{ articleCount }}</span>
-                                </div>
-                            </div>
-                            <div class="topDataLi2">
-                                <div class="topDataMainCenter">
-                                    <span @click="goToList(2)">待审核商品</span>
-                                    <span @click="goToList(2)">{{ goodsCount }}</span>
+                            <el-col :xs="24" :sm="24" :lg="4">
+                                <div class="topDataLi1">
+                                    <div class="topDataMain">
+                                        <span @click="goToList(1)">待审核资讯</span>
+                                        <span @click="goToList(1)">{{ articleCount }}</span>
+                                    </div>
                                 </div>
-                                <div class="topDataMainCenter">
-                                    <span @click="goToList(3)">待审核书刊音像</span>
-                                    <span @click="goToList(3)">{{ bookCount }}</span>
+                            </el-col>
+                            <em class="topDataLine"></em>
+                            <el-col :xs="24" :sm="24" :lg="5">
+                                <div class="topDataLi2">
+                                    <div class="topDataMainCenter">
+                                        <span @click="goToList(2)">待审核商品</span>
+                                        <span @click="goToList(2)">{{ goodsCount }}</span>
+                                    </div>
+                                    <div class="topDataMainCenter">
+                                        <span @click="goToList(3)">待审核书刊音像</span>
+                                        <span @click="goToList(3)">{{ bookCount }}</span>
+                                    </div>
                                 </div>
-                            </div>
-                            <div class="topDataLi3">
-                                <!-- <div class="topDataMainCenter">
+                            </el-col>
+                            <em class="topDataLine"></em>
+                            <el-col :xs="24" :sm="24" :lg="4">
+                                <div class="topDataLi3">
+                                    <!-- <div class="topDataMainCenter">
                                     <span @click="goToList(4)">待审核招聘</span>
                                     <span @click="goToList(4)">{{ jobRecruitingCount }}</span>
                                 </div> -->
-                                <div class="topDataMainCenter">
-                                    <span @click="goToList(5)">待审核求职</span>
-                                    <span @click="goToList(5)">{{ jobHuntingCount }}</span>
-                                </div>
-                            </div>
-                            <div class="topDataLi5">
-                                <div class="topDataMain">
-                                    <span @click="goToList(9)">待审核企业</span>
-                                    <span @click="goToList(9)">{{ complanyCount }}</span>
+                                    <div class="topDataMainCenter">
+                                        <span @click="goToList(5)">待审核求职</span>
+                                        <span @click="goToList(5)">{{ jobHuntingCount }}</span>
+                                    </div>
                                 </div>
-                                <div class="topDataMain">
-                                    <span @click="goToList(10)">待审核项目</span>
-                                    <span @click="goToList(10)">{{ projectCount }}</span>
+                            </el-col>
+                            <em class="topDataLine"></em>
+                            <el-col :xs="24" :sm="24" :lg="4">
+                                <div class="topDataLi5">
+                                    <div class="topDataMain">
+                                        <span @click="goToList(9)">待审核企业</span>
+                                        <span @click="goToList(9)">{{ complanyCount }}</span>
+                                    </div>
+                                    <div class="topDataMain">
+                                        <span @click="goToList(10)">待审核项目</span>
+                                        <span @click="goToList(10)">{{ projectCount }}</span>
+                                    </div>
                                 </div>
-                            </div>
+                            </el-col>
                         </div>
                     </div>
                 </el-col>
@@ -433,43 +458,53 @@
                             <div class="topDataBoxTitleText">待审核列表</div>
                         </div>
                         <div class="topDataBoxList">
-                            <div class="topDataLi1">
-                                <div class="topDataMain">
-                                    <span @click="goToList(1)">待审核资讯</span>
-                                    <span @click="goToList(1)">{{ articleCount }}</span>
-                                </div>
-                            </div>
-                            <div class="topDataLi2">
-                                <div class="topDataMainCenter">
-                                    <span @click="goToList(2)">待审核商品</span>
-                                    <span @click="goToList(2)">{{ goodsCount }}</span>
-                                </div>
-                                <div class="topDataMainCenter">
-                                    <span @click="goToList(3)">待审核书刊音像</span>
-                                    <span @click="goToList(3)">{{ bookCount }}</span>
-                                </div>
-                            </div>
-                            <div class="topDataLi4">
-                                <div class="topDataMain">
-                                    <span @click="goToList(6)">待审核行政通知</span>
-                                    <span @click="goToList(6)">{{ noticeCount }}</span>
+                            <el-col :xs="24" :sm="24" :lg="4">
+                                <div class="topDataLi1">
+                                    <div class="topDataMain">
+                                        <span @click="goToList(1)">待审核资讯</span>
+                                        <span @click="goToList(1)">{{ articleCount }}</span>
+                                    </div>
                                 </div>
-                                <div class="topDataMain">
-                                    <span @click="goToList(7)">待审核行政投诉</span>
-                                    <span @click="goToList(7)">{{ complaintCount }}</span>
+                            </el-col>
+                            <em class="topDataLine"></em>
+                            <el-col :xs="24" :sm="24" :lg="5">
+                                <div class="topDataLi2">
+                                    <div class="topDataMainCenter">
+                                        <span @click="goToList(2)">待审核商品</span>
+                                        <span @click="goToList(2)">{{ goodsCount }}</span>
+                                    </div>
+                                    <div class="topDataMainCenter">
+                                        <span @click="goToList(3)">待审核书刊音像</span>
+                                        <span @click="goToList(3)">{{ bookCount }}</span>
+                                    </div>
                                 </div>
-                            </div>
-                            <div class="topDataLi5">
-                                <div class="topDataMain">
-                                    <span @click="goToList(9)">待审核企业</span>
-                                    <span @click="goToList(9)">{{ complanyCount }}</span>
+                            </el-col>
+                            <em class="topDataLine"></em>
+                            <el-col :xs="24" :sm="24" :lg="5">
+                                <div class="topDataLi4">
+                                    <div class="topDataMain">
+                                        <span @click="goToList(6)">待审核行政通知</span>
+                                        <span @click="goToList(6)">{{ noticeCount }}</span>
+                                    </div>
+                                    <div class="topDataMain">
+                                        <span @click="goToList(7)">待审核行政投诉</span>
+                                        <span @click="goToList(7)">{{ complaintCount }}</span>
+                                    </div>
                                 </div>
-                                <div class="topDataMain">
-                                    <span @click="goToList(10)">待审核项目</span>
-                                    <span @click="goToList(10)">{{ projectCount }}</span>
+                            </el-col>
+                            <em class="topDataLine"></em>
+                            <el-col :xs="24" :sm="24" :lg="4">
+                                <div class="topDataLi5">
+                                    <div class="topDataMain">
+                                        <span @click="goToList(9)">待审核企业</span>
+                                        <span @click="goToList(9)">{{ complanyCount }}</span>
+                                    </div>
+                                    <div class="topDataMain">
+                                        <span @click="goToList(10)">待审核项目</span>
+                                        <span @click="goToList(10)">{{ projectCount }}</span>
+                                    </div>
                                 </div>
-                            </div>
-
+                            </el-col>
                         </div>
                     </div>
                 </el-col>
@@ -674,38 +709,49 @@
                             <div class="topDataBoxTitleText">待审核列表</div>
                         </div>
                         <div class="topDataBoxList">
-                            <div class="topDataLi1">
-                                <div class="topDataMain">
-                                    <span @click="goToList(1)">待审核资讯</span>
-                                    <span @click="goToList(1)">{{ articleCount }}</span>
-                                </div>
-                            </div>
-                            <div class="topDataLi2">
-                                <div class="topDataMainCenter">
-                                    <span @click="goToList(2)">待审核商品</span>
-                                    <span @click="goToList(2)">{{ goodsCount }}</span>
-                                </div>
-                                <div class="topDataMainCenter">
-                                    <span @click="goToList(3)">待审核书刊音像</span>
-                                    <span @click="goToList(3)">{{ bookCount }}</span>
+                            <el-col :xs="24" :sm="24" :lg="4">
+                                <div class="topDataLi1">
+                                    <div class="topDataMain">
+                                        <span @click="goToList(1)">待审核资讯</span>
+                                        <span @click="goToList(1)">{{ articleCount }}</span>
+                                    </div>
                                 </div>
-                            </div>
-                            <div class="topDataLi3">
-                                <div class="topDataMainCenter">
-                                    <span @click="goToList(4)">待审核招聘</span>
-                                    <span @click="goToList(4)">{{ jobRecruitingCount }}</span>
+                            </el-col>
+                            <em class="topDataLine"></em>
+                            <el-col :xs="24" :sm="24" :lg="5">
+                                <div class="topDataLi2">
+                                    <div class="topDataMainCenter">
+                                        <span @click="goToList(2)">待审核商品</span>
+                                        <span @click="goToList(2)">{{ goodsCount }}</span>
+                                    </div>
+                                    <div class="topDataMainCenter">
+                                        <span @click="goToList(3)">待审核书刊音像</span>
+                                        <span @click="goToList(3)">{{ bookCount }}</span>
+                                    </div>
                                 </div>
-                            </div>
-                            <div class="topDataLi5">
-                                <div class="topDataMain">
-                                    <span @click="goToList(9)">待审核企业</span>
-                                    <span @click="goToList(9)">{{ complanyCount }}</span>
+                            </el-col>
+                            <em class="topDataLine"></em>
+                            <el-col :xs="24" :sm="24" :lg="4">
+                                <div class="topDataLi3">
+                                    <div class="topDataMainCenter">
+                                        <span @click="goToList(4)">待审核招聘</span>
+                                        <span @click="goToList(4)">{{ jobRecruitingCount }}</span>
+                                    </div>
                                 </div>
-                                <div class="topDataMain">
-                                    <span @click="goToList(10)">待审核项目</span>
-                                    <span @click="goToList(10)">{{ projectCount }}</span>
+                            </el-col>
+                            <em class="topDataLine"></em>
+                            <el-col :xs="24" :sm="24" :lg="4">
+                                <div class="topDataLi5">
+                                    <div class="topDataMain">
+                                        <span @click="goToList(9)">待审核企业</span>
+                                        <span @click="goToList(9)">{{ complanyCount }}</span>
+                                    </div>
+                                    <div class="topDataMain">
+                                        <span @click="goToList(10)">待审核项目</span>
+                                        <span @click="goToList(10)">{{ projectCount }}</span>
+                                    </div>
                                 </div>
-                            </div>
+                            </el-col>
                         </div>
                     </div>
                 </el-col>
@@ -879,32 +925,40 @@
                             <div class="topDataBoxTitleText">待审核列表</div>
                         </div>
                         <div class="topDataBoxList">
-                            <div class="topDataLi1">
-                                <div class="topDataMain">
-                                    <span @click="goToList(1)">待审核资讯</span>
-                                    <span @click="goToList(1)">{{ articleCount }}</span>
-                                </div>
-                            </div>
-                            <div class="topDataLi2">
-                                <div class="topDataMainCenter">
-                                    <span @click="goToList(2)">待审核商品</span>
-                                    <span @click="goToList(2)">{{ goodsCount }}</span>
-                                </div>
-                                <div class="topDataMainCenter">
-                                    <span @click="goToList(3)">待审核书刊音像</span>
-                                    <span @click="goToList(3)">{{ bookCount }}</span>
+                            <el-col :xs="24" :sm="24" :lg="4">
+                                <div class="topDataLi1">
+                                    <div class="topDataMain">
+                                        <span @click="goToList(1)">待审核资讯</span>
+                                        <span @click="goToList(1)">{{ articleCount }}</span>
+                                    </div>
                                 </div>
-                            </div>
-                            <div class="topDataLi5">
-                                <div class="topDataMain">
-                                    <span @click="goToList(9)">待审核企业</span>
-                                    <span @click="goToList(9)">{{ complanyCount }}</span>
+                            </el-col>
+                            <em class="topDataLine"></em>
+                            <el-col :xs="24" :sm="24" :lg="5">
+                                <div class="topDataLi2">
+                                    <div class="topDataMainCenter">
+                                        <span @click="goToList(2)">待审核商品</span>
+                                        <span @click="goToList(2)">{{ goodsCount }}</span>
+                                    </div>
+                                    <div class="topDataMainCenter">
+                                        <span @click="goToList(3)">待审核书刊音像</span>
+                                        <span @click="goToList(3)">{{ bookCount }}</span>
+                                    </div>
                                 </div>
-                                <div class="topDataMain">
-                                    <span @click="goToList(10)">待审核项目</span>
-                                    <span @click="goToList(10)">{{ projectCount }}</span>
+                            </el-col>
+                            <em class="topDataLine"></em>
+                            <el-col :xs="24" :sm="24" :lg="4">
+                                <div class="topDataLi5">
+                                    <div class="topDataMain">
+                                        <span @click="goToList(9)">待审核企业</span>
+                                        <span @click="goToList(9)">{{ complanyCount }}</span>
+                                    </div>
+                                    <div class="topDataMain">
+                                        <span @click="goToList(10)">待审核项目</span>
+                                        <span @click="goToList(10)">{{ projectCount }}</span>
+                                    </div>
                                 </div>
-                            </div>
+                            </el-col>
                         </div>
                     </div>
                 </el-col>
@@ -966,6 +1020,48 @@
                     </div>
                 </el-col>
             </el-row>
+            <!--lj 系统消息开始 -->
+            <el-row :gutter="32">
+                <el-col :xs="24" :sm="24" :lg="12">
+                    <div class="chartBox">
+                        <div class="chartTitle">系统消息</div>
+                        <div class="chart-wrapper">
+                            <div v-for="item in sys_msg" :key="item.id" class="sys_msg_item">
+                                <div class="sys_msg_class" :class="item.class">{{ item.class }}</div>
+                                <div @click="goToDetail(item.id, item.class)" class="sys_msg_title"> {{
+                                    truncateTitle(item.title) }}
+                                    <span class="tick">...提交了审核</span>
+                                </div>
+
+                                <div class="sys_msg_time">{{ item.formatted_updated_at }}</div>
+                            </div>
+                        </div>
+                    </div>
+                </el-col>
+                <el-col :xs="24" :sm="24" :lg="12">
+                    <div class="chartBox">
+
+                        <div class="chartBox">
+                            <div class="chartTitle">聊天消息</div>
+                            <div class="chart-wrapper">
+                                <div v-for="item in chat_msg" :key="item.id" class="sys_msg_item">
+                                    <div class="sys_msg_class" :class="item.class">{{ item.class }}</div>
+                                    <div @click="goToDetail(item.id, item.class)" class="sys_msg_title"> {{
+                                        truncateTitle(item.content) }}
+                                        <span class="tick" v-if="item.class == '群聊'">..收到了一条群消息</span>
+                                        <span class="tick" v-if="item.class == '单聊'">..收到了一条消息</span>
+                                        <span class="tick" v-if="item.class == '话题'">..收到了一条评论</span>
+                                    </div>
+                                    <div class="sys_msg_time">{{ item.formatted_updated_at }}</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </el-col>
+            </el-row>
+            <div style="height: 20px;" class="noticeTabs">
+            </div>
+            <!-- lj 系统消息结束 -->
         </div>
     </div>
 </template>
@@ -1264,11 +1360,12 @@ export default {
 //顶部数据展示
 .topDataBoxList {
     display: flex;
+    justify-content: space-between;
     align-items: center;
 
     .topDataLi1 {
-        width: 248px;
-        border-right: 1px solid #fff;
+        // width: 180px;
+        width: 100%;
         height: 70px;
 
         .topDataMain:nth-child(1) {
@@ -1276,14 +1373,10 @@ export default {
         }
     }
 
-    .topDataLi2 {
-        border-right: 1px solid #fff;
-    }
-
     .topDataLi2,
     .topDataLi3 {
-        width: 318px;
-        border-right: 1px solid #fff;
+        // width: 180px;
+        width: 100%;
         height: 70px;
 
         .topDataMainCenter:nth-child(1) {
@@ -1292,8 +1385,8 @@ export default {
     }
 
     .topDataLi4 {
-        width: 318px;
-        border-right: 1px solid #fff;
+        // width: 180px;
+        width: 100%;
         height: 70px;
 
         .topDataMain {
@@ -1306,11 +1399,12 @@ export default {
     }
 
     .topDataLi5 {
-        width: 248px;
+        // width: 180px;
+        width: 100%;
         height: 70px;
 
         .topDataMain {
-            margin-left: 70px;
+            margin: 0 auto;
         }
 
         .topDataMain:nth-child(1) {
@@ -1318,12 +1412,20 @@ export default {
         }
     }
 
+    .topDataLine {
+        display: inline-block;
+        width: 1px;
+        height: 70px;
+        background: #fff;
+    }
+
     .topDataMain,
     .topDataMainCenter {
         color: #fff;
         height: 26px;
         line-height: 26px;
-        width: 177px;
+        // width: 170px;
+        width: 100%;
         display: flex;
         align-items: center;
         justify-content: space-between;