修改

public/index.html

@@ -38,7 +38,7 @@
 
   <!-- 开发环境 -->
   <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
-    <script>window.SITE_CONFIG['apiURL'] = 'http://124.225.17.80:8060';</script>
+    <script>window.SITE_CONFIG['apiURL'] = 'http://124.225.17.80:8156/api-idaas';</script>
     <!-- <script>window.SITE_CONFIG['apiURL'] = '/api';</script> -->
   <% } %>
   <!-- 集成测试环境 -->

src/assets/scss/smp.scss

@@ -821,16 +821,18 @@ html,body{
     span{
       position:absolute;
       top:0;
-      right:0;
+      left:2px;
       transform: translate(40%,-40%);
       background-color: $smp--color-red;
       border-radius:40px;
       color:$smp--color-white;
-      width:22px;
+      min-width:22px;
+      padding:0 3px;
+      font-size:14px;
       height:22px;
       display: flex;
       align-items: center;
-      text-indent: 3px;
+      justify-content: center;
       border:3px solid $smp--color-blue;
     }
   }
@@ -1135,6 +1137,9 @@ html,body{
       }
     }
   }
+  .el-breadcrumb__inner.is-link{
+    font-weight:normal;
+  }
 }
 
 /* smp content
@@ -2036,6 +2041,9 @@ $list: apiwg bzdlys bzdxsj bzqxyx bzslwp bzswmx bzyxsj clda czrz dawh dazdy dddl
 
 // 通知列表
 .notice-pop{
+  .el-dialog__title{
+    font-weight:bold;
+  }
   .el-dialog__body{
     padding:10px 20px 20px;
   }
@@ -2046,18 +2054,118 @@ $list: apiwg bzdlys bzdxsj bzqxyx bzslwp bzswmx bzyxsj clda czrz dawh dazdy dddl
     margin:0 0 20px;
     li{
       display: flex;
-      height:36px;
+      height:44px;
       align-items: center;
     }
     .nplb-l{
       flex:1;
       padding:0 20px 0 0;
+      display: flex;
+      align-items: center;
+    }
+    .nplb-type{
+      flex-shrink: 0;
+      color:$smp--color-font-color-3;
+    }
+    .nplb-icon{
+      width:17px;
+      height:17px;
+      background: url("~@/assets/img/index/sy_tzlb.png") no-repeat 0 0;
+      flex-shrink: 0;
+    }
+    .nplb-title{
+      padding:0 0 0 10px;
+      flex:1;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      width: 0;
     }
     .nplb-r{
-      width:130px;
+      width:160px;
+      flex-shrink: 0;
+    }
+  }
+  .smp-pagination{
+    display: flex;
+    justify-content: center;
+  }
+}
+.np-tabs{
+  &.el-tabs--card > .el-tabs__header{
+    border-bottom:none;
+  }
+  .el-tabs__nav-scroll{
+    display: flex;
+    justify-content: center;
+    .el-tabs__nav{
+      border:none;
+      border-radius:0;
+    }
+    .el-tabs__item{
+      width:160px;
+      height:36px;
+      text-align: center;
+      // display: flex;
+      // justify-content: center;
+      border:none;
+      background-color: #efefef;
+      color:$smp--color-font-color-6;
+      &.is-active{
+        color:$smp--color-white;
+        background-color: $smp--color-blue;
+      }
+      .np-tabs-my-item{
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        height:100%;
+        i{
+          background-color: $smp--color-red;
+          border-radius:40px;
+          color:$smp--color-white;
+          min-width:18px;
+          font-size:14px;
+          height:18px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          margin:0 0 0 5px;
+        }
+      }
     }
   }
 }
+.npl-detail{
+  .npld-title{
+    height:36px;
+    font-size:18px;
+    display: flex;
+    align-items: center;
+    color:#333;
+  }
+  .npld-time-box{
+    display: flex;
+    padding:10px 0;
+  }
+  .npld-time{
+    height:20px;
+    display: flex;
+    align-items: center;
+    color:#999;
+  }
+  .npld-author{
+    height:20px;
+    display: flex;
+    align-items: center;
+    color:#999;
+    padding:0 0 0 20px;
+  }
+  .npld-summary{
+    line-height: 20px;
+    color:#666;
+  }
+}
 @-webkit-keyframes twinkling{
   0%{
     opacity:1;

src/mock/index.js

@@ -15,10 +15,10 @@ fnCreate(jobSchedule, true)
 fnCreate(oss, true)
 fnCreate(sysConfig, true)
 fnCreate(sysLog, true)
-fnCreate(common, false)
-fnCreate(sysMenu, false)
-fnCreate(sysRole, false)
-fnCreate(sysUser, false)
+fnCreate(common, true)
+fnCreate(sysMenu, true)
+fnCreate(sysRole, true)
+fnCreate(sysUser, true)
 
 /**
  * 创建mock模拟数据

src/mock/modules/sys-menu.js

@@ -564,7 +564,7 @@ var navDataList4 = [
     'ename': 'jcyjindex3',
     'path': 'jcyjindex3',
     'componentPath': 'business/home/home',
-    'url': 'http://124.12.12.12:1234/fu/index.html',
+    'url': 'https://www.baidu.com',
     'children': []
   },
   {
@@ -572,7 +572,7 @@ var navDataList4 = [
     'parentUUID': '11',
     'name': 'xiao监测预警',
     'ename': 'jcyjindex',
-    'path': 'jcyjindex3',
+    'path': 'jcyjindex33',
     'componentPath': 'business/home/home',
     'children': []
   },

src/router/index.js

@@ -70,7 +70,7 @@ router.beforeEach((to, from, next) => {
     }
     let toPath = findPathInHttpMenu(to, res.menuList)
     let firstPath = toPath || getFirstPath(res.menuList)
-    setPathByUUID(res.menuList)
+    // setPathByUUID(res.menuList)
     // console.log(to, from, res, firstPath)
     // if (!firstPath) {
     //   let homePage = {
@@ -97,7 +97,8 @@ router.beforeEach((to, from, next) => {
 function findPathInHttpMenu (to, list) {
   let backPath = ''
   list.forEach((e) => {
-    let path = e.path || e.UUID
+    let path = e.UUID
+    // let path = e.path || e.UUID
     if ('/' + path === to.path) {
       backPath = path
     }
@@ -109,7 +110,8 @@ function getFirstPath (list) {
   let backPath = ''
   for (let i = 0; i < list.length; i++) {
     let e = list[i]
-    let path = e.path || e.UUID
+    let path = e.UUID
+    // let path = e.path || e.UUID
     if (!e.parentUUID && path && e.url) {
       backPath = path
       break
@@ -153,7 +155,8 @@ function fnAddDynamicMenuRoutes (menuList = [], routes = []) {
       temp = temp.concat(menuList[i].children)
       continue
     }
-    let path = menuList[i].path || menuList[i].UUID
+    let path = menuList[i].UUID
+    // let path = menuList[i].path || menuList[i].UUID
     let componentPath = menuList[i].componentPath
     let url = menuList[i].url
     // if (!url) {

src/utils/request.js

@@ -16,7 +16,7 @@ const http = axios.create({
  */
 http.interceptors.request.use(config => {
   // 临时免登陆
-  // Cookies.set('token', '8dcbf9730cec72cf8435e4f7e67e27fc')
+  Cookies.set('token', '49e42af404cbb94096920626f01fb6f6')
   config.headers['Accept-Language'] = Cookies.get('language') || 'zh-CN'
   config.headers['sessionToken'] = Cookies.get('token') || ''
   // 默认参数

src/views/main/main-content-crumb.vue

@@ -1,9 +1,12 @@
 <template>
   <div class="smp-crumb">
-    <div class="smpc-item" v-for="(item,index) in menuChain" :key="index">
+    <el-breadcrumb separator-class="el-icon-arrow-right">
+      <el-breadcrumb-item v-for="(item,index) in menuChain" :key="index" :to="{ path: '/'+item.UUID }">{{item.name}}</el-breadcrumb-item>
+    </el-breadcrumb>
+    <!-- <div class="smpc-item" v-for="(item,index) in menuChain" :key="index">
       <i v-if="index!==0">></i>
       <span :class="index===menuChain.length-1">{{item.name}}</span>
-    </div>
+    </div> -->
     <!-- <div class="smpc-item"><span>首页</span></div>
     <div class="smpc-item">
       <i>></i>
@@ -37,6 +40,20 @@ export default {
       })
       this.menuChain = item
       this.setParentItem(item[0].parentUUID)
+      // let menuChain = []
+      // this.menuChain.forEach((e, i) => {
+      //   console.log(e.url)
+      //   let obj = {
+      //     ...e,
+      //     id: e.UUID,
+      //     url: e.url ? e.url : e.path ? ('/' + e.path) : ''
+      //   }
+      //   if (i === this.menuChain.length - 1) {
+      //     obj.url = ''
+      //   }
+      //   menuChain.push(obj)
+      // })
+      // this.menuChain = menuChain
       // console.log(this.menuChain, this.menuList)
     },
     findParent (parentId) {

src/views/main/main-navbar-menu.vue

@@ -118,6 +118,7 @@ export default {
       let item = this.menuList.filter((e) => {
         return e.UUID === UUID
       })[0]
+      console.log(UUID, this.menuList)
       this.gotoPage(item)
     },
     clickOutSide () {
@@ -153,7 +154,8 @@ export default {
         children: 'children'
       })
       list.forEach((e) => {
-        e.url = e.path ? ('/' + e.path) : ''
+        e.url = e.UUID
+        // e.url = e.path ? ('/' + e.path) : ''
         e.on = false
         e.icon = iconArr[iconIndex++]
         if (iconIndex === iconArr.length) {

src/views/main/main-navbar-news.vue

@@ -2,15 +2,15 @@
   <div class="navbar-news">
     <!-- 权限写法 -->
     <!-- <div class="nn-item" v-if="$hasPermission2('sys_test_add')" > -->
-    <div class="nn-item" @click="showTask" title="我的代办">
-      <i class="smp-nav-icon smp-ni-news shansuo">
+    <div class="nn-item" @click="showTask" title="用户消息">
+      <i class="smp-nav-icon smp-ni-news" :class="{shansuo:taskNum}">
       </i>
-      <span>5</span>
+      <span v-if="taskNum">{{taskStr}}</span>
     </div>
     <div class="nn-item" @click="showNotice" title="通知公告">
-      <i class="smp-nav-icon smp-ni-notice">
+      <i class="smp-nav-icon smp-ni-notice" :class="{shansuo:noticeNum}">
       </i>
-      <span>7</span>
+      <span v-if="noticeNum">{{noticeStr}}</span>
     </div>
   </div>
 </template>
@@ -19,26 +19,78 @@
 export default {
   data () {
     return {
-      isOpen: false
+      isOpen: false,
+      taskUrl: 'http://124.225.17.80:8146/odae/clue/supervisionTask/pressTaskList',
+      taskNum: 0,
+      noticeNum: 0
+    }
+  },
+  computed: {
+    taskStr () {
+      if (this.taskNum > 0) {
+        if (this.taskNum > 9) {
+          return '9+'
+        }
 
+        return this.taskNum
+      }
+    },
+    noticeStr () {
+      if (this.noticeNum > 0) {
+        if (this.noticeNum > 9) {
+          return '9+'
+        }
+
+        return this.noticeNum
+      }
     }
   },
-  // computed: {
-  //   permission () {
-  //     return this.$store.state.permission
-  //   }
-  // },
+  mounted () {
+    this.getTask()
+    this.getNotice()
+  },
   methods: {
     showNews () {},
     showNotice () {
-      // this.$parent.$parent.showNotice()
-      this.$parent.$refs.navbarmenu.gotoPageByUUID('fe9b5adf20975c1bd13fd38cee3b09a68VfGsVRBgJ3')
-      this.$router.push({ path: '/868d8c7a976fef5061445869bfe1977bpttjDGgxV5Q' })
+      this.$parent.$parent.showNotice()
+      // this.$parent.$refs.navbarmenu.gotoPageByUUID('fe9b5adf20975c1bd13fd38cee3b09a68VfGsVRBgJ3')
+      // this.$router.push({ path: '/868d8c7a976fef5061445869bfe1977bpttjDGgxV5Q' })
     },
     showTask () {
-      // this.$parent.$parent.showTask()
-      this.$parent.$refs.navbarmenu.gotoPageByUUID('fe9b5adf20975c1bd13fd38cee3b09a68VfGsVRBgJ3')
-      this.$router.push({ path: '/7f66c3390e920c5a72a2252ce1dded62kj1sQpUXu8Q' })
+      this.$parent.$parent.showTask()
+      // this.$parent.$refs.navbarmenu.gotoPageByUUID('fe9b5adf20975c1bd13fd38cee3b09a68VfGsVRBgJ3')
+      // this.$router.push({ path: '/7f66c3390e920c5a72a2252ce1dded62kj1sQpUXu8Q' })
+    },
+    getTask () {
+      let config = {
+        status: 0
+      }
+      this.$http.get(
+        '/sys/message/list',
+        {
+          params: config
+        }
+
+      ).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.taskNum = res.messageList.length
+      }).catch(() => {
+
+      })
+    },
+    getNotice () {
+      this.$http.get(
+        '/sys/notice/list'
+      ).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.noticeNum = res.noticeList.length
+      }).catch(() => {
+
+      })
     }
   }
 }

src/views/main/main-navbar.vue

@@ -7,7 +7,7 @@
     </div>
     <div class="navbar-bd">
       <navbar-menu ref="navbarmenu"></navbar-menu>
-      <navbar-news></navbar-news>
+      <navbar-news ref="navbarnews"></navbar-news>
       <navbar-user></navbar-user>
     </div>
   </nav>

src/views/main/main-sidebar.vue

@@ -187,7 +187,7 @@ export default {
       this.currentMenuList = this.currentMenuItem.children || []
       this.currentMenuName = this.currentMenuItem.name
       this.initMenu()
-      console.log(this.currentMenuList)
+      // console.log(this.currentMenuList)
     },
     '$route.meta.UUID': function (val) {
       // console.log(val)
@@ -199,7 +199,7 @@ export default {
   },
   methods: {
     remedyMenuNoChange () {
-      console.log('remedyMenuNoChange')
+      // console.log('remedyMenuNoChange')
       // this.currentMenuItem = this.$store.state.sidebarMenuItem
       let currentMenuItem = this.$store.state.sidebarMenuItem
       this.currentMenuList = currentMenuItem.children || []
@@ -220,10 +220,10 @@ export default {
       if (currentMenuList) {
         this.slideMenu = this.addMenu(currentMenuList, lv)
       }
-      console.log(this.slideMenu)
+      // console.log(this.slideMenu)
     },
     setActiveOne () {
-      console.log(this.$route.meta.UUID)
+      // console.log(this.$route.meta.UUID)
       this.activeIndex = this.$route.meta.UUID
     },
     addMenu (arr, lv) {
@@ -236,7 +236,8 @@ export default {
             ...e,
             lv: lv,
             id: e.UUID,
-            url: e.path ? ('/' + e.path) : '',
+            // url: e.path ? ('/' + e.path) : '',
+            url: e.UUID,
             on: false,
             icon: lv === 1 ? iconArr[iconIndex++] : ''
           }

src/views/main/main.vue

@@ -1,6 +1,7 @@
 <template>
   <div :style="auiWrapper" v-loading.fullscreen.lock="loading" :element-loading-text="$t('loading')" class="aui-wrapper all-main-wraper">
     <template v-if="!loading">
+      <!-- <div @click="menuChangeCeshi">路径切换导航</div> -->
       <div class="smp_main-t">
         <main-navbar ref="mainNavbar" v-if="navbarFlag"/>
       </div>
@@ -106,6 +107,7 @@ export default {
     // },
     getMenuList () {
       this.menuDataAll = window.SITE_CONFIG['menuList']
+      console.log(this.menuDataAll)
     },
     checkMenu (origin) {
       let arr = this.menuDataAll.filter((e) => {
@@ -122,6 +124,43 @@ export default {
       clearLoginInfo()
       this.$router.push({ name: 'login' })
     },
+    menuChangeCeshi () {
+      let config = {
+        path: 'https://www.baidu.com'
+      }
+      this.menuChange(config)
+    },
+    menuChange (config) {
+      console.log(config)
+      let path = config.path
+      let menuObj = {}
+      let parent = ''
+      let item = this.menuDataAll.filter((e) => {
+        return e.url === path
+      })[0]
+      if (item) {
+        this.menuDataAll.forEach((e) => {
+          menuObj[e.UUID] = e
+        })
+
+        parent = this.findParent(menuObj, item)
+        console.log(menuObj, parent, item)
+        this.$refs.mainNavbar.$refs.navbarmenu.gotoPageByUUID(parent.UUID)
+        this.$router.push({ path: item.UUID })
+      }
+
+      // clearLoginInfo()
+      // this.$router.push({ name: 'login' })
+    },
+    findParent (obj, item) {
+      // console.log(item.id)
+      let parent = obj[item.parentUUID]
+      if (parent) {
+        return this.findParent(obj, parent)
+      } else {
+        return item
+      }
+    },
     isMyEvent (name, obj) {
       let isHas = false
       Object.keys(obj).forEach((e) => {
@@ -135,7 +174,8 @@ export default {
     monitorChild () {
       let _this = this
       let eventObj = {
-        tokenInvalid: _this.tokenInvalid.bind(this)
+        tokenInvalid: _this.tokenInvalid.bind(this),
+        menuChange: _this.menuChange.bind(this)
       }
       window.addEventListener('message', function (e) {
         if (!e.data.event || !_this.isMyEvent(e.data.event, eventObj)) {

src/views/main/notice-pop-list.vue

@@ -1,12 +1,16 @@
 <template>
   <div class="notice-pop-list">
     <ul class="npl-box">
-      <li v-for="(item, index) in listData" :key="index">
+      <li v-for="(item, index) in listData" :key="index" @click="gotoDetail(item)">
         <div class="nplb-l">
-          {{ item.title }}
+          <div class="nplb-type">【通知】</div>
+          <div class="nplb-icon"></div>
+          <div class="nplb-title">
+            {{ item.title }}
+          </div>
         </div>
         <div class="nplb-r">
-          {{ item.time }}
+          {{ item.sendTime }}
         </div>
       </li>
     </ul>
@@ -20,22 +24,40 @@
       @current-change="pagingChange"
     >
     </el-pagination>
+    <el-dialog
+      title="详情"
+      :visible.sync="dialogVisible"
+      width="30%"
+      :modal-append-to-body="true"
+      :append-to-body="true">
+      <div class="npl-detail">
+        <div class="npld-summary">{{detail}}</div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 export default {
   props: {
-    getList: ''
+    // config: {
+    //   default () {
+    //     return {}
+    //   }
+    // }
   },
   data () {
     return {
+      didNum: '',
       listData: [],
+      url: 'http://124.225.17.80:8146/odae/clue/supervisionTask/pressTaskList',
       pagingConfig: {
-        perPageNum: 5,
-        totalNum: 1,
+        perPageNum: 10,
+        totalNum: 0,
         currentPage: 1
-      }
+      },
+      dialogVisible: false,
+      detail: {}
     }
   },
   mounted () {
@@ -43,15 +65,56 @@ export default {
   },
   methods: {
     getData () {
-      this.getList(this.pagingConfig, this.setData.bind(this))
+      this.getList(this.didNum)
+    },
+    getList () {
+      this.$http.get(
+        '/sys/notice/list'
+      ).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.setData(res.noticeList)
+      }).catch(() => {
+
+      })
     },
     pagingChange (num) {
       this.pagingConfig.currentPage += 1
       this.getData()
     },
     setData (d) {
-      this.listData = d
+      this.listData = d.map((e) => {
+        return {
+          ...e
+        }
+      })
       // this.listData
+    },
+    gotoDetail (item) {
+      this.getDetail(item)
+      // this.dialogVisible = true
+      // this.detail = item
+      // console.log(item.id)
+      // if (this.didNum === 0) {
+      //   this.pressRead(item)
+      // }
+    },
+    getDetail (item) {
+      this.$http.get(
+        '/sys/notice/detail',
+        {
+          params: {
+            id: item.id
+          }
+        }
+      ).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dialogVisible = true
+        this.detail = res.detail
+      }).catch(() => {})
     }
   }
 }

src/views/main/notice-pop.vue

@@ -6,23 +6,16 @@
     @opened="popOpen"
     width="50%">
     <div class="np-bd">
-      <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-        <el-tab-pane label="已查阅" name="0">
-          <noticePoplist ref="noticeDid" :getList="getListDid"></noticePoplist>
-        </el-tab-pane>
-        <el-tab-pane label="未查阅" name="1">
-          <noticePoplist ref="noticeUndid" :getList="getListDid"></noticePoplist>
-        </el-tab-pane>
-      </el-tabs>
+      <noticeskPoplist ref="noticeskPoplist"></noticeskPoplist>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import noticePoplist from './notice-pop-list'
+import noticeskPoplist from './notice-pop-list'
 export default {
   components: {
-    noticePoplist
+    noticeskPoplist
   },
   props: {
 
@@ -33,32 +26,18 @@ export default {
   data () {
     return {
       firstPop: true,
-      dialogVisible: false,
-      activeName: '',
-      tabsFirst: [false, false]
+      dialogVisible: false
     }
   },
   mounted () {
   },
   methods: {
     getListData () {
-      let noGet = this.tabsFirst[this.activeName]
-      if (!noGet) {
-        this.tabsFirst[this.activeName] = true
-        if (this.activeName === '0') {
-          this.$refs.noticeDid.getData()
-        } else {
-          this.$refs.noticeUndid.getData()
-        }
-      }
-    },
-    handleClick () {
-      this.getListData()
+      this.$refs.noticeskPoplist.getList()
     },
     popOpen () {
       if (this.firstPop) {
         this.firstPop = false
-        this.activeName = '0'
         this.getListData()
       }
     },
@@ -67,37 +46,6 @@ export default {
     },
     closePop () {
       this.dialogVisible = false
-    },
-    getListDid (pageConfig, cb) {
-      let config = {
-        isDid: true
-      }
-      this.getList(config, pageConfig, cb)
-    },
-    ceshi (pageConfig, cb) {
-      pageConfig.totalNum = 14
-      let d = [{
-        title: '常常的标题补平常',
-        time: '2020-09-09 08:09:09'
-      }]
-      d = d.concat(d)
-      d = d.concat(d)
-      d = d.concat(d)
-      cb(d)
-    },
-    getList (config, pageConfig, cb) {
-      this.ceshi(pageConfig, cb)
-      return
-      this.$http.get('/monitor/selectBkSearchInfo', { params: { queryParam: config } }).then(({ data: res }) => {
-        if (res.code !== '0') {
-          return this.$message.error(res.msg)
-        }
-        let data = res.list
-        pageConfig.totalNum = res.total
-        cb(data)
-      }).catch(() => {
-
-      })
     }
   }
 }

src/views/main/task-pop-list.vue

@@ -0,0 +1,142 @@
+<template>
+  <div class="notice-pop-list">
+    <ul class="npl-box">
+      <li v-for="(item, index) in listData" :key="index" @click="gotoDetail(item)">
+        <div class="nplb-l">
+          <div class="nplb-type">【消息】</div>
+          <div class="nplb-icon"></div>
+          <div class="nplb-title">
+            {{ item.title }}
+          </div>
+        </div>
+        <div class="nplb-r">
+          {{ item.sendTime }}
+        </div>
+      </li>
+    </ul>
+    <el-pagination
+      background
+      class="smp-pagination"
+      layout="prev, pager, next"
+      :pager-count="5"
+      :page-size="pagingConfig.perPageNum"
+      :total="pagingConfig.totalNum"
+      @current-change="pagingChange"
+    >
+    </el-pagination>
+    <el-dialog
+      title="详情"
+      :visible.sync="dialogVisible"
+      width="30%"
+      :modal-append-to-body="true"
+      :append-to-body="true">
+      <div class="npl-detail">
+        <div class="npld-title">{{detail.title}}</div>
+        <div class="npld-time-box">
+          <div class="npld-time">{{detail.sendTime}}</div>
+          <div class="npld-author">{{detail.sender}}</div>
+        </div>
+        <div class="npld-summary">{{detail.detail}}</div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    // config: {
+    //   default () {
+    //     return {}
+    //   }
+    // }
+  },
+  data () {
+    return {
+      didNum: '',
+      listData: [],
+      url: 'http://124.225.17.80:8146/odae/clue/supervisionTask/pressTaskList',
+      pagingConfig: {
+        perPageNum: 10,
+        totalNum: 100,
+        currentPage: 1
+      },
+      dialogVisible: false,
+      detail: {}
+    }
+  },
+  mounted () {
+    // this.getData()
+  },
+  methods: {
+    getData () {
+      this.getList(this.didNum)
+    },
+    getList (didNum) {
+      this.didNum = didNum
+      let config = {
+        status: didNum
+      }
+      this.$http.get(
+        '/sys/message/list',
+        {
+          params: config
+        }
+
+      ).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.$emit('update', res.messageList.length)
+        this.setData(res.messageList)
+      }).catch(() => {
+
+      })
+    },
+    pagingChange (num) {
+      this.pagingConfig.currentPage += 1
+      this.getData()
+    },
+    setData (d) {
+      this.listData = d.map((e) => {
+        return {
+          ...e
+        }
+      })
+      // this.listData
+    },
+    gotoDetail (item) {
+      this.dialogVisible = true
+      this.detail = item
+      // console.log(this.$parent.$parent.$parent.$parent.$parent.$refs['mainNavbar'].$refs['navbarnews'])
+      // console.log(item.id)
+      if (this.didNum === 0) {
+        this.pressRead(item)
+      }
+    },
+    pressRead (item) {
+      this.$http.get('/sys/message/pressRead',
+        {
+          params: {
+            id: item.id
+          }
+        }
+      ).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.getList(this.didNum)
+
+        this.$parent.$parent.$parent.$parent.$parent.$refs['mainNavbar'].$refs['navbarnews'].getTask()
+        // this.$message.success(res.msg)
+      }).catch(() => {})
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.smp-list-time {
+  // padding: 0!important;
+}
+</style>

src/views/main/task-pop.vue

@@ -1,17 +1,18 @@
 <template>
   <el-dialog
-    :title="'任务列表'"
+    :title="'消息列表'"
     :visible.sync="dialogVisible"
     class="notice-pop"
     @opened="popOpen"
     width="50%">
     <div class="np-bd">
-      <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-        <el-tab-pane label="已处理" name="0">
-          <noticePoplist ref="noticeDid" :getList="getListDid"></noticePoplist>
+      <el-tabs class="np-tabs" v-model="activeName" type="card" @tab-click="handleClick">
+        <el-tab-pane label="" name="0">
+          <span class="np-tabs-my-item" slot="label">未阅读<i v-if="noReadNum">{{noReadNum}}</i></span>
+          <taskPoplist ref="taskUndid" @update="getNoReadNum"></taskPoplist>
         </el-tab-pane>
-        <el-tab-pane label="未处理" name="1">
-          <noticePoplist ref="noticeUndid" :getList="getListDid"></noticePoplist>
+        <el-tab-pane label="已阅读" name="1">
+          <taskPoplist ref="taskDid"></taskPoplist>
         </el-tab-pane>
       </el-tabs>
     </div>
@@ -19,10 +20,10 @@
 </template>
 
 <script>
-import noticePoplist from './notice-pop-list'
+import taskPoplist from './task-pop-list'
 export default {
   components: {
-    noticePoplist
+    taskPoplist
   },
   props: {
 
@@ -35,20 +36,32 @@ export default {
       firstPop: true,
       dialogVisible: false,
       activeName: '',
-      tabsFirst: [false, false]
+      tabsFirst: [false, false],
+      noReadNum: ''
     }
   },
   mounted () {
   },
   methods: {
+    getNoReadNum (num) {
+      if (num > 0) {
+        if (num > 9) {
+          this.noReadNum = '9+'
+        }
+
+        this.noReadNum = num + ''
+      } else {
+        this.noReadNum = ''
+      }
+    },
     getListData () {
       let noGet = this.tabsFirst[this.activeName]
       if (!noGet) {
         this.tabsFirst[this.activeName] = true
         if (this.activeName === '0') {
-          this.$refs.noticeDid.getData()
+          this.$refs.taskUndid.getList(0)
         } else {
-          this.$refs.noticeUndid.getData()
+          this.$refs.taskDid.getList(1)
         }
       }
     },
@@ -67,37 +80,6 @@ export default {
     },
     closePop () {
       this.dialogVisible = false
-    },
-    getListDid (pageConfig, cb) {
-      let config = {
-        isDid: true
-      }
-      this.getList(config, pageConfig, cb)
-    },
-    ceshi (pageConfig, cb) {
-      pageConfig.totalNum = 14
-      let d = [{
-        title: '常常的标题补平常',
-        time: '2020-09-09 08:09:09'
-      }]
-      d = d.concat(d)
-      d = d.concat(d)
-      d = d.concat(d)
-      cb(d)
-    },
-    getList (config, pageConfig, cb) {
-      this.ceshi(pageConfig, cb)
-      return
-      this.$http.get('/monitor/selectBkSearchInfo', { params: { queryParam: config } }).then(({ data: res }) => {
-        if (res.code !== '0') {
-          return this.$message.error(res.msg)
-        }
-        let data = res.list
-        pageConfig.totalNum = res.total
-        cb(data)
-      }).catch(() => {
-
-      })
     }
   }
 }