首页屏幕适配，我的消息调整为未读消息，去除标签页

src/assets/styles/pages/dashboard.scss

@@ -2,6 +2,13 @@ $img-px:150px;
 $transition:all .5s;
 
 .ibps-desktop-page {
+  .verticalCenterFlex{
+    display: flex;
+    align-items: center;
+    .el-card__body{
+      padding: 0 20px;
+    }
+  }
   .changeShadow{
     .pendingAssigneeClass{
       margin: 12px 0 !important;
@@ -22,6 +29,7 @@ $transition:all .5s;
       border-radius: 100px;
       font-size: 12px;
       height: 100%;
+      margin-left: 1%;
       padding: 0.2% 1.4% 0.2% 1.2%;
     }
     .el-tabs__header{

src/views/system/dashboard/templates/myFavorites.vue

@@ -1,14 +1,15 @@
 <template>
-    <el-card class="box-card">
+    <el-card class="box-card changeShadow">
         <div slot="header" class="clearfix">
+          	<ibps-icon name="logo" />
             <span>{{ title }}</span>
             <ibps-desktop-toolbar
                 ref="toolbar"
-                :actions="[{ key: 'refresh' }, { key: 'more' }, { key: 'fullscreen' }, { key: 'collapse' }]"
+                :actions="[{ key: 'refresh' }, { key: 'more' }, { key: 'collapse' }]"
                 @action-event="handleActionEvent"
             />
         </div>
-        <div ref="body" :style="{height:showHeight,width:'100%'}">
+        <div ref="body" :style="{height:getAddHeight(0),width:'100%'}">
             <el-scrollbar
                 style="height: 100%;width:100%;"
                 wrap-class="ibps-scrollbar-wrapper"
@@ -23,8 +24,8 @@
                             <el-link slot="title" type="primary" :underline="false">{{ d.name|removeHtmlTag }}</el-link>
                         </ibps-list-item-meta>
                         <div slot="extra">
-                            <ibps-icon name="dot-circle-o" style="color:#36c6d3" />
-                            {{ d.status | filterStatus('favorites') }}
+                            <!-- <ibps-icon name="dot-circle-o" style="color:#36c6d3" /> -->
+                            <el-tag size="mini" type="warning">{{ d.status | filterStatus('favorites') }}</el-tag>
                         </div>
                     </ibps-list-item>
                 </ibps-list>

src/views/system/dashboard/templates/myMessage.vue

@@ -1,11 +1,24 @@
+
+//标签页版
 <template>
     <el-card :style="{height:cardHeight}" class="box-card changeShadow">
+        <div slot="header" class="clearfix">
+            <ibps-icon name="commenting" />
+            <div style="width: 50%;display: inline-flex;align-items: center;">
+                <span>{{ title }}</span>
+                <span class="totalityClass">{{totality==null?'0':totality.totalCount>999?'999+':totality.totalCount}}</span> 
+            </div>
+            <ibps-desktop-toolbar
+                ref="toolbar"
+                :actions="[{ key: 'refresh' }, { key: 'more' }, { key: 'collapse' }]"
+                @action-event="handleActionEvent"
+            />
+        </div>
         <div>
-            <div class="tabs-title">
+            <!-- <div class="tabs-title">
                 <ibps-icon name="commenting" />
                 <span style="font-size: 15px;margin: 0 1%;">{{ title }}</span>
-                <!-- <el-badge :value="12" class="item"></el-badge> -->
-                <span class="totalityClass">{{ totality.totalCount>999?'999+':totality.totalCount }}</span>
+                <span class="totalityClass">{{totality==null?'0':totality.totalCount>999?'999+':totality.totalCount}}</span> 
             </div>
             <div class="tabs-toolbar">
                 <ibps-desktop-toolbar
@@ -14,6 +27,7 @@
                     @action-event="handleActionEvent"
                 />
             </div>
+             -->
             <div ref="body">
                 <el-tabs
                     ref="unreadMessageTabs"
@@ -24,7 +38,7 @@
                     })"
                 >
                     <el-tab-pane label="未读" name="innerMessage" style="margin:0;">
-                        <div ref="tabsContent" :style="{height: getAddHeight(20), width: '100%'}" class="tabs-content">
+                        <div ref="tabsContent" :style="{height:getAddHeight(20),width:'100%'}" class="tabs-content">
                             <el-scrollbar
                                 style="height: 100%;width:100%;"
                                 wrap-class="ibps-scrollbar-wrapper"
@@ -37,12 +51,14 @@
                                     >
                                         <ibps-list-item-meta>
                                             <ibps-icon slot="avatar" name="bolt" style="color:#5cb85c;margin:5px 0 0 5px;" />
+
                                             <el-link slot="title" type="primary" :underline="false">{{ d.subject }}</el-link>
                                             <template slot="description">{{ d.createTime|dateFormat }}</template>
                                         </ibps-list-item-meta>
                                         <div slot="extra">
                                             <!-- <ibps-icon name="dot-circle-o" style="color:#36c6d3" /> -->
                                             <el-tag size="mini" type="warning">{{ d.messageType | filterStatus('unreadMessage') }}</el-tag>
+                                            
                                         </div>
                                     </ibps-list-item>
                                 </ibps-list>
@@ -93,3 +109,68 @@
         </div>
     </el-card>
 </template>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/////
+ <!--<template>-->
+    <!-- <el-card :style="{height:cardHeight}" class="box-card changeShadow">
+        <div slot="header" class="clearfix">
+            <ibps-icon name="commenting" />
+            <div style="width: 50%;display: inline-flex;align-items: center;">
+                <span>{{ title }}</span>
+                <span class="totalityClass">{{totality==null?'0':totality.totalCount>999?'999+':totality.totalCount}}</span> 
+            </div>
+            <ibps-desktop-toolbar
+                ref="toolbar"
+                :actions="[{ key: 'refresh' }, { key: 'more' }, { key: 'collapse' }]"
+                @action-event="handleActionEvent"
+            />
+        </div>
+        <div>
+            <div ref="body" :style="{height:getAddHeight(),width:'100%'}">
+                <el-scrollbar
+                    style="height: 100%;width:100%;"
+                    wrap-class="ibps-scrollbar-wrapper"
+                >
+                    <ibps-list v-if="data && data.length >0" class="ibps-pr-10">
+                        <ibps-list-item
+                            v-for="(d,index) in data"
+                            :key="index"
+                            @click.native="handleUnreadMessage(d.id)"
+                        >
+                            <ibps-list-item-meta>
+                                <ibps-icon slot="avatar" name="bolt" style="color:#5cb85c;margin:5px 0 0 5px;" />
+
+                                <el-link slot="title" type="primary" :underline="false">{{ d.subject }}</el-link>
+                                <template slot="description">{{ d.createTime|dateFormat }}</template>
+                            </ibps-list-item-meta>
+                            <div slot="extra">
+                                <!-- <ibps-icon name="dot-circle-o" style="color:#36c6d3" /> -->
+                                <el-tag size="mini" type="warning">{{ d.messageType | filterStatus('unreadMessage') }}</el-tag>
+                                
+                            </div>
+                        </ibps-list-item>
+                    </ibps-list>
+                    <el-alert
+                        v-else
+                        :title="$t('common.noData')"
+                        :closable="false"
+                        type="warning"
+                    />
+                </el-scrollbar>
+            </div>
+        </div>
+    </el-card> -->
+ <!--</template>-->

src/views/system/dashboard/templates/quickNavigation.vue

@@ -1,47 +1,53 @@
 <template>
-    <el-card :style="{height:cardHeight}" class="box-card">
-        <div slot="header" class="clearfix">
-            <span>快速开始/快捷导航</span>
-            <el-button icon="ibps-icon-add" type="primary" size="mini" @click="getFormData">添加</el-button>
+<el-card :style="{ height: cardHeight }" class="box-card changeShadow">
+    <div slot="header" class="clearfix">
+        <span>快速开始/快捷导航</span>
+        <el-button
+            icon="ibps-icon-add"
+            type="primary"
+            size="mini"
+            style="padding: 4px 10px;"
+            @click="getFormData"
+        >添加</el-button>
+    </div>
+    <div ref="body" :style="{height: showHeight, width: '100%'}">
+        <div :style="{height: showHeight, width: '100%'}" class="nav-content">
+            <el-tag
+                v-for="(tag, i) in quickNavigationData"
+                :key="i"
+                closable
+                :disable-transitions="false"
+                @close="handleClose(tag.id, i)"
+            >
+                <a :href="tag.urlAddr" :target="tag.display">{{ tag.urlName }}</a>
+            </el-tag>
         </div>
-        <div ref="body" :style="{height:showHeight,width:'100%'}">
-            <div :style="{height:showHeight,width:'100%'}" class="nav-content">
-                <el-tag
-                    v-for="(tag,i) in quickNavigationData"
-                    :key="i"
-                    closable
-                    :disable-transitions="false"
-                    @close="handleClose(i)"
-                >
-                    <a :href="tag.url" :target="tag.target">{{ tag.label }}</a>
-                </el-tag>
-            </div>
+    </div>
+    <el-dialog
+        :visible.sync="dialogFormVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        title="添加快捷导航"
+        append-to-body
+    >
+        <el-form ref="form" :model="form" :rules="rules" :label-width="formLabelWidth" @submit.native.prevent>
+            <el-form-item label="名称:" prop="label">
+                <el-input v-model="form.label" autocomplete="off" />
+            </el-form-item>
+            <el-form-item label="url地址:" prop="url">
+                <el-input v-model="form.url" autocomplete="off" placeholder="请填写完整的URL地址，如https://www.szjyxt.com" />
+            </el-form-item>
+            <el-form-item label="打开方式:" prop="target">
+                <el-select v-model="form.target" placeholder="请选择" style="width:100%">
+                    <el-option label="新页面打开" value="_blank" />
+                    <el-option label="当前页面打开" value="_self" />
+                </el-select>
+            </el-form-item>
+        </el-form>
+        <div slot="footer" class="el-dialog--center">
+            <el-button type="primary" icon="el-icon-circle-save" @click="saveQuickNav">确 定</el-button>
+            <el-button icon="ibps-icon-close" @click="close">关 闭</el-button>
         </div>
-        <el-dialog
-            :visible.sync="dialogFormVisible"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            title="添加"
-            append-to-body
-        >
-            <el-form ref="form" :model="form" :rules="rules" :label-width="formLabelWidth" @submit.native.prevent>
-                <el-form-item label="名称:" prop="label">
-                    <el-input v-model="form.label" autocomplete="off" />
-                </el-form-item>
-                <el-form-item label="url地址:" prop="url">
-                    <el-input v-model="form.url" autocomplete="off" />
-                </el-form-item>
-                <el-form-item label="新页面显示:" prop="target">
-                    <el-select v-model="form.target" placeholder="请选择" style="width:100%">
-                        <el-option label="是" value="_blank" />
-                        <el-option label="否" value="_self" />
-                    </el-select>
-                </el-form-item>
-            </el-form>
-            <div slot="footer" class="el-dialog--center">
-                <el-button type="primary" icon="el-icon-circle-save" @click="confirm">确 定</el-button>
-                <el-button icon="ibps-icon-close" @click="close">关 闭</el-button>
-            </div>
-        </el-dialog>
-    </el-card>
+    </el-dialog>
+</el-card>
 </template>

src/views/system/homepage/index.vue

@@ -161,7 +161,7 @@ export default {
             reportPath: BASE_API() + BUSINESS_BASE_URL() + '/sys/SysDataContext/replaceReportFile',
             layout: null,
             colNum: 24,
-            rowHeight: 30,
+            rowHeight: 33,
             isDraggable: false,
             isResizable: false,
             isMirrored: false,
@@ -338,6 +338,15 @@ export default {
             }, 100)
         },
         getHeight (h) {
+            if(document.body.clientWidth>1366&&document.body.clientWidth<1920){
+                let mH = (1920-1366)/(33-23)
+                this.rowHeight=((document.body.clientWidth-1366)/mH)+23
+                // let mH = (1925-768)/(33-23)
+                // this.rowHeight=((document.body.clientWidth-768)/mH)+17
+                // console.log(this.rowHeight)
+            }else if(document.body.clientWidth<=1366){
+                this.rowHeight=23
+            }
             return (h - 1) * (this.rowHeight + this.margin[1]) + this.margin[1]
         },
         hasComponent (alias) {