Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

@@ -53,17 +53,6 @@ const defaultCallback = action => {
         callback(action);
       }
     }
-    if (currentMsg.resolve) {
-      if (action === 'confirm') {
-        if (instance.showInput) {
-          currentMsg.resolve({ value: instance.inputValue, action });
-        } else {
-          currentMsg.resolve(action);
-        }
-      } else if (currentMsg.reject && (action === 'cancel' || action === 'close')) {
-        currentMsg.reject(action);
-      }
-    }
   }
 };
 
@@ -120,7 +109,7 @@ const showNextMsg = () => {
   }
 };
 
-const MessageBox = function(options, callback) {
+const MessageBox = function (options, callback) {
   if (Vue.prototype.$isServer) return;
   if (typeof options === 'string' || isVNode(options)) {
     options = {

 <template>
   <transition name="msgbox-fade">
-    <div class="el-message-box__wrapper" tabindex="-1"   
-    v-show="visible" @click.self="handleWrapperClick" role="dialog"
+    <div class="el-message-box__wrapper" tabindex="-1" v-show="visible" @click.self="handleWrapperClick" role="dialog"
       aria-modal="true" :aria-label="title || 'dialog'">
       <div class="el-message-box" :class="[customClass, center && 'el-message-box--center']">
         <div class="el-message-box__content">
@@ -187,11 +186,6 @@ export default {
     visible (val) {
       if (val) {
         this.uid++;
-        if (this.$type === 'alert' || this.$type === 'confirm') {
-          this.$nextTick(() => {
-            this.$refs.confirm.$el.focus();
-          });
-        }
         this.focusAfterClosed = document.activeElement;
         messageBox = new Dialog(this.$el, this.focusAfterClosed, this.getFirstFocus());
       }
@@ -267,9 +261,11 @@ export default {
 .el-message-box__wrapper {
   background: none;
 }
+
 .el-message-box {
   border: none;
 }
+
 .el-message-box__content {
   min-height: 150px;
   padding-top: 30px;

@@ -9,12 +9,10 @@
       </div>
       <div class="right-menu">
         <svg-icon class="function" icon-class='function' />
-        <el-dropdown class="avatar-container right-menu-item hover-effect" @command="handleCommand">
-          <div class="avatar-wrapper">
+        <div class="avatar-wrapper right-menu-item hover-effect">
           <img :src="avatar + '?imageView2/1/w/80/h/80'" class="user-avatar" />
           <span style="margin-left: 10px;">{{ name }}</span>
         </div>
-        </el-dropdown>
 
         <svg-icon class="shutdown" icon-class='shutdown' />
       </div>
@@ -220,7 +218,6 @@ export default {
       }
     }
 
-    .avatar-container {
     .avatar-wrapper {
       position: relative;
       display: flex;
@@ -243,6 +240,5 @@ export default {
       }
     }
   }
-  }
 }
 </style>

@@ -14,7 +14,7 @@
     top: $headerHeight;
     bottom: 0;
     left: 0;
-    z-index: 1001;
+    z-index: 80;
     background-color: $subMenuBg;
     // overflow: hidden;
 

@@ -19,16 +19,14 @@
               <h5 class="title">系统通知</h5>
               <i class="el-icon-s-unfold pointer"></i>
             </div>
-            <vue-seamless-scroll :data="noticeList" :class-option="classOption">
             <ul>
-                <li v-for="(item, index) in noticeList" :key="index" @click="handleNotice" class="flexst pointer">
+              <li v-for="(item, index) in noticeList" :key="index" @click="handleNotice(item)" class="flexst pointer">
                 <p class="list-title">{{ item.noticeTitle }}</p>
                 <p class="marginZL15">{{ item.createtime.substring(0, 10) }}</p>
                 <p v-if="item.userBrowse == '1'" style="color:red">未读</p>
                 <p v-else>已读</p>
               </li>
             </ul>
-            </vue-seamless-scroll>
           </el-card>
         </el-col>
       </el-row>
@@ -150,25 +148,17 @@ export default {
         year: '1996',
         value: 31056
       }],
+      // 系统通知
+      noticeData: {
+
+      },
       noticeList: [],
       todoList: [],
       doneList: [],
-      policyList: []
+      policyList: [],
+
     }
   },
-  // 计算属性 类似于data概念
-  computed: {
-    classOption () {
-      return {
-        step: 0.5, // 数值越大速度滚动越快
-        limitMoveNum: 2, // 开始无缝滚动的数据量 this.dataList.length
-        hoverStop: true, // 是否开启鼠标悬停stop
-        direction: 1, // 0向下 1向上 2向左 3向右
-        openWatch: true, // 开启数据实时监控刷新dom
-        singleHeight: 0, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
-      };
-    },
-  },
   mounted () {
     this.buildChart();
     this.queryTodoList();
@@ -184,7 +174,7 @@ export default {
     queryTodoList () {
       getHomeTodoList().then(res => {
         if (res.result) {
-          this.todoList = res.result.slice(0, 5)
+          this.todoList = res.result
         }
       })
     },
@@ -204,7 +194,7 @@ export default {
           this.noticeList.forEach(item => {
             item.createtime = this._timedate(item.createtime)
           })
-          this.policyList = res.result.policyList.slice(0, 5)
+          this.policyList = res.result.policyList
         }
       })
     },
@@ -252,7 +242,8 @@ export default {
       chart.line().position('year*value').size(2).shape('smooth');
       chart.render();
     },
-    handleNotice () {
+    handleNotice (item) {
+      console.log(item);
       this.$alertMes('9999999999')
       //setReadStatus({'bsmNotice':bsmNotice})
     }