0624需求修改

src/api/storeManage/taskManage/index.js

@@ -10,8 +10,8 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: 'api/roles',
-    method: 'delete',
+    url: 'api/device/deleteTimedTasks',
+    method: 'post',
     data: ids
   })
 }
@@ -33,4 +33,13 @@ export function FetchStatus(data) {
   })
 }
 
-export default { add, edit, del, FetchStatus }
+// 计划任务日志
+export function FetchInitTimedTasksLog(parameter) {
+  return request({
+    url: 'api/device/initTimedTasksLog',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export default { add, edit, del, FetchStatus, FetchInitTimedTasksLog }

src/api/system/user.js

@@ -69,5 +69,23 @@ export function resetpassword(data) {
   })
 }
 
-export default { add, edit, del, resetpassword }
+// 我得消息
+export function FetchMyNotice(params) {
+  return request({
+    url: 'api/users/myNotice',
+    method: 'get',
+    params
+  })
+}
+
+// 我得消息全部标记已读
+export function FetchMyReadAll(data) {
+  return request({
+    url: 'api/users/myReadAll',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del, resetpassword, FetchMyNotice, FetchMyReadAll }
 

src/layout/components/Navbar.vue

@@ -44,7 +44,7 @@
             <el-dropdown-item v-for="(item,index) in msgList" :key="index" class="message-list-item">
               <router-link :to="{ path: '/user/center', query: { activeIndex: 1 }}">
                 <p>{{ item.noticeContent }}</p>
-                <span>{{ item.create_time | parseTime }}</span>
+                <span>{{ item.createTime | parseTime }}</span>
                 <i class="el-icon-arrow-right" />
               </router-link>
             </el-dropdown-item>
@@ -112,7 +112,8 @@ import Logo from '@/layout/components/Sidebar/Logo'
 // import SizeSelect from '@/components/SizeSelect'
 // import Search from '@/components/HeaderSearch'
 import Avatar from '@/assets/images/avatar.png'
-import { getUserNotice, isread } from '@/api/system/logs'
+// import { isread } from '@/api/system/logs'
+import { FetchMyNotice, FetchMyReadAll } from '@/api/system/user'
 
 export default {
   inject: ['reload'],
@@ -167,16 +168,16 @@ export default {
     async getMsgList() {
       const params = {
         page: 0,
-        size: 10,
+        size: 10
         // createTime: [],
-        sort: 'createTime,desc'
+        // sort: 'createTime,desc'
       }
       const list = []
       const allList = await this.getAllNoRead(params, list)
-      allList.forEach(item => {
-        item.pushUserName = item.noticeUsers[0].pushUserName
-        item.isRead = item.noticeUsers[0].isRead
-      })
+      // allList.forEach(item => {
+      //   item.pushUserName = item.noticeUsers[0].pushUserName
+      //   item.isRead = item.noticeUsers[0].isRead
+      // })
       const arr = allList.filter(item => { return !item.isRead })
       if (arr.length > 20) {
         this.msgList = arr.slice(0, 20)
@@ -186,21 +187,21 @@ export default {
     },
     // 全部已读
     async handleAllRead() {
-      const params = {
-        page: 0,
-        size: 10,
-        // createTime: [],
-        sort: 'createTime,desc'
-      }
-      const list = []
-      const ids = []
-      const allList = await this.getAllNoRead(params, list)
-      allList.forEach(item => {
-        item.noticeUsers.forEach(i => {
-          ids.push(i.id)
-        })
-      })
-      isread(ids).then(res => {
+      // const params = {
+      //   page: 0,
+      //   size: 10
+      //   // createTime: [],
+      //   // sort: 'createTime,desc'
+      // }
+      // const list = []
+      // const ids = []
+      // const allList = await this.getAllNoRead(params, list)
+      // allList.forEach(item => {
+      //   item.noticeUsers.forEach(i => {
+      //     ids.push(i.id)
+      //   })
+      // })
+      FetchMyReadAll().then(res => {
         if (res) {
           this.msgList = []
           // this.$router.go(0)
@@ -212,7 +213,7 @@ export default {
     },
     // 递归获取所有消息列表
     async getAllNoRead(params, list) {
-      const allList = await getUserNotice(params).then(res => {
+      const allList = await FetchMyNotice(params).then(res => {
         list = list.concat(res.content)
         if ((list.length) < res.totalElements) {
           params.page++

src/views/storeManage/taskManage/index.vue

@@ -33,12 +33,13 @@
             <!-- 如果是都选中了，就是整点和半点每间隔30分钟执行一次！！ -->
             <div v-if="scope.row.timerType===4 && scope.row.timeInterval === '1'">整点</div>
             <div v-if="scope.row.timerType===4 && scope.row.timeInterval === '2'">半点</div>
-            <div v-if="scope.row.timerType===4 && (scope.row.timeInterval && scope.row.timeInterval.split(',').length === 2)">整点/半点</div>
+            <div v-if="scope.row.timerType===4 && (scope.row.timeInterval && scope.row.timeInterval.indexOf(',') !== -1 && scope.row.timeInterval.split(',').length === 2)">整点/半点</div>
           </template>
         </el-table-column>
         <el-table-column prop="nextExecute" label="下次运行">
           <template slot-scope="scope">
-            <div>{{ scope.row.nextExecute | parseTime }}</div>
+            <div v-if="scope.row.nextExecute">{{ scope.row.nextExecute | parseTime }}</div>
+            <div v-else> - </div>
           </template>
         </el-table-column>
         <el-table-column prop="lastExecute" label="最后运行">
@@ -209,9 +210,9 @@ import pagination from '@crud/Pagination'
 import Detail from './module/detail'
 import { parseTime, timeToTimestamp } from '@/utils/index.js'
 import { getAllDev } from '@/api/system/logs'
-import qs from 'qs'
-import { exportFile } from '@/utils/index'
-import { mapGetters } from 'vuex'
+// import qs from 'qs'
+// import { exportFile } from '@/utils/index'
+// import { mapGetters } from 'vuex'
 
 const defaultForm = { id: null, taskType: null, deviceId: null, taskName: null, timerType: 2, timeInterval: 1, status: 1, startTime2: parseTime(new Date().getTime()), endTime2: null, nowTime: null, longTime: true, remark: null, halfOrPart: [] }
 
@@ -364,10 +365,10 @@ export default {
   computed: {
     isRequired() {
       return this.form.longTime === false
-    },
-    ...mapGetters([
-      'baseApi'
-    ])
+    }
+    // ...mapGetters([
+    //   'baseApi'
+    // ])
   },
   created() {
   },
@@ -387,17 +388,18 @@ export default {
     },
     // 初始化编辑时候的角色与岗位
     [CRUD.HOOK.beforeToEdit](crud, form) {
-      if (form.endTime === null) {
-        form.longTime = true
-      }
       if (form.timerType === 4 && form.timeInterval) {
-        form.halfOrPart = form.timeInterval.split(',')
+        form.halfOrPart = form.timeInterval.split(',').map(Number)
       }
       if (form.startTime) {
         this.form.startTime2 = parseTime(form.startTime)
       }
       if (form.endTime) {
         this.form.endTime2 = parseTime(form.endTime)
+        form.longTime = false
+      } else {
+        this.form.endTime2 = null
+        form.longTime = true
       }
     },
     [CRUD.HOOK.beforeValidateCU](crud, form) {
@@ -426,7 +428,6 @@ export default {
       delete crud.form.endTime2
       delete crud.form.nowTime
       delete crud.form.halfOrPart
-      console.log(crud.form)
       return true
     },
     changeFormTab(index) {
@@ -467,6 +468,8 @@ export default {
       if (val === 4) {
         this.form.timeInterval = null
         this.form.halfOrPart = [1]
+      } else {
+        this.form.timeInterval = 1
       }
     },
     // 获取设备
@@ -499,6 +502,10 @@ export default {
     // 双击详情
     handleDbClick(row) {
       this.$refs.detailRefs.detailVisible = true
+      this.$refs.detailRefs.detailTitle = row.taskName + '-日志'
+      this.$refs.detailRefs.currentTaskId = row.id
+      this.$refs.detailRefs.page.page = 1
+      this.$refs.detailRefs.getInitTimedTasksLog(row.id)
     },
     // 改变状态
     changeStatus(data, val) {
@@ -511,26 +518,25 @@ export default {
           'id': data.id,
           'status': val
         }
-        console.log('params', params)
-        // crudTask.FetchStatus(params).then(res => {
-        //   this.crud.notify('状态修改成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        // }).catch(() => {
-        //   data.status = !data.status
-        // })
+        crudTask.FetchStatus(params).then(res => {
+          this.crud.notify('状态修改成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        }).catch(() => {
+          data.status = !data.status
+        })
       }).catch(() => {
-        // data.status = !data.status
+        data.status = !data.status
       })
-    },
-    // 导出接口调用
-    downloadApi(data) {
-      const ids = data.map(item => { return item.id })
-      const params = {
-        'logIds': ids
-      }
-      console.log(params)
-      // /case/exportCaseLogList
-      exportFile(this.baseApi + '/api?' + qs.stringify(params, { indices: false }))
     }
+    // 导出接口调用
+    // downloadApi(data) {
+    //   const ids = data.map(item => { return item.id })
+    //   const params = {
+    //     'logIds': ids
+    //   }
+    //   console.log(params)
+    //   // /case/exportCaseLogList
+    //   exportFile(this.baseApi + '/api?' + qs.stringify(params, { indices: false }))
+    // }
   }
 }
 </script>

src/views/storeManage/taskManage/module/detail.vue

@@ -1,20 +1,27 @@
 <template>
   <div>
-    <el-dialog class="detail-dialog" title="xxx通风任务1-日志" :visible.sync="detailVisible" append-to-body>
+    <el-dialog class="detail-dialog" :title="detailTitle" :visible.sync="detailVisible" append-to-body>
       <span class="dialog-right-top" />
       <span class="dialog-left-bottom" />
       <div class="setting-dialog">
-        <el-table :data="tableData" max-height="400px" style="margin-top:15px;">
-          <el-table-column prop="categoryName" label="任务类型" align="center" />
-          <el-table-column prop="archiveNo" label="目标设备" align="center" />
-          <el-table-column prop="maintitle" label="执行结果" align="center" />
-          <el-table-column prop="caseName" label="执行时间" align="center">
+        <el-table v-loading="loading" :data="tableData" max-height="400px" style="margin-top:15px;">
+          <el-table-column prop="taskType" label="任务类型" align="center">
+            <template slot-scope="scope">
+              <div v-if="scope.row.taskType===1">通风任务</div>
+              <div v-else>其他任务</div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="deviceName" label="目标设备" align="center" />
+          <el-table-column prop="actionResult" label="执行结果" align="center" />
+          <el-table-column prop="createTime" label="执行时间" align="center">
             <template slot-scope="scope">
               <div>{{ scope.row.createTime | parseTime }}</div>
             </template>
           </el-table-column>
         </el-table>
         <el-pagination
+          v-if="tableData.length!==0"
+          style="margin: 50px 0 30px 0 !important;"
           :current-page="page.page"
           :total="page.total"
           :page-size="page.size"
@@ -29,11 +36,15 @@
 </template>
 
 <script>
+import { FetchInitTimedTasksLog } from '@/api/storeManage/taskManage/index'
 export default {
   name: 'Detail',
   mixins: [],
   data() {
     return {
+      loading: false,
+      currentTaskId: null,
+      detailTitle: '通风日志',
       detailVisible: false,
       tableData: [],
       page: {
@@ -44,14 +55,29 @@ export default {
     }
   },
   methods: {
+    getInitTimedTasksLog(taskId) {
+      this.loading = true
+      const params = {
+        'taskId': taskId,
+        'page': this.page.page - 1,
+        'size': this.page.size
+      }
+      FetchInitTimedTasksLog(params).then(res => {
+        this.tableData = res.content
+        this.page.total = res.totalElements
+        this.loading = false
+      })
+    },
     // 每页条数改变
     sizeChangeHandler(e) {
       this.page.size = e
       this.page.page = 1
+      this.getInitTimedTasksLog(this.currentTaskId)
     },
     // 当前页改变
     pageChangeHandler(e) {
       this.page.page = e
+      this.getInitTimedTasksLog(this.currentTaskId)
     }
   }
 }
@@ -62,7 +88,7 @@ export default {
   ::v-deep .el-dialog{
     width: 800px !important;
     .el-dialog__body{
-      padding: 20px 0 60px 0;
+      padding: 20px 0;
     }
     .el-dialog__header .el-dialog__close::before{
       position: absolute;

src/views/system/user/messageCenter/index.vue

@@ -36,9 +36,9 @@
         </template>
       </el-table-column>
       <el-table-column prop="pushUserName" label="推送人" align="center" min-width="150" />
-      <el-table-column prop="create_time" label="推送时间" align="center" min-width="180">
+      <el-table-column prop="createTime" label="推送时间" align="center" min-width="180">
         <template slot-scope="scope">
-          <div>{{ scope.row.create_time | parseTime }}</div>
+          <div>{{ scope.row.createTime | parseTime }}</div>
         </template>
       </el-table-column>
     </el-table>
@@ -67,22 +67,24 @@
 
 <script>
 import DateRangePicker from '@/components/DateRangePicker'
-import { getUserNotice, isread, userMsgDel } from '@/api/system/logs'
-import CRUD, { presenter, header, crud } from '@crud/crud'
+// getUserNotice
+import { isread, userMsgDel } from '@/api/system/logs'
+import { FetchMyNotice, FetchMyReadAll } from '@/api/system/user'
+// import CRUD, { presenter, header, crud } from '@crud/crud'
 import { mapGetters } from 'vuex'
 
 export default {
   name: 'MessageCenter',
   inject: ['reload'],
   components: { DateRangePicker },
-  mixins: [presenter(), crud(), header()],
-  cruds() {
-    return CRUD({
-      url: 'api/users/notice',
-      sort: [],
-      optShow: {}
-    })
-  },
+  // mixins: [presenter(), crud(), header()],
+  // cruds() {
+  //   return CRUD({
+  //     url: 'api/users/myNotice',
+  //     sort: [],
+  //     optShow: {}
+  //   })
+  // },
   data() {
     return {
       tableData: [],
@@ -125,14 +127,14 @@ export default {
   methods: {
     getTableData() {
       this.isLoading = true
-      getUserNotice(this.getParams()).then(res => {
+      FetchMyNotice(this.getParams()).then(res => {
         this.page.total = res.totalElements
-        const table = res.content
-        table.forEach(item => {
-          item.pushUserName = item.noticeUsers[0].pushUserName
-          item.isRead = item.noticeUsers[0].isRead
-        })
-        this.tableData = table
+        // const table = res.content
+        // table.forEach(item => {
+        //   item.pushUserName = item.noticeUsers[0].pushUserName
+        //   item.isRead = item.noticeUsers[0].isRead
+        // })
+        this.tableData = res.content
         this.isLoading = false
       })
     },
@@ -140,20 +142,16 @@ export default {
       const params = {
         page: this.page.page - 1,
         size: this.page.size,
-        createTime: this.query.createTime,
+        startTime: this.query.createTime ? this.query.createTime[0] : null,
+        endTime: this.query.createTime ? this.query.createTime[1] : null,
         isRead: this.query.isRead
-        // sort: 'createTime,desc'
       }
       return params
     },
     getUserMsgId(list) {
       const ids = []
       list.forEach(item => {
-        item.noticeUsers.forEach(i => {
-          // if (i.userId === this.user.id) {
-          ids.push(i.id)
-          // }
-        })
+        ids.push(item.noticeUserId)
       })
       return ids
     },
@@ -163,39 +161,41 @@ export default {
         if (res) {
           // this.getTableData()
           this.reload()
+          this.$route.query.activeIndex = 1
         }
       })
     },
     // 全部标记已读
     async handleAllRead() {
-      const params = {
-        page: 0,
-        size: 10
-        // createTime: [],
-        // sort: 'createTime,desc'
-      }
-      const list = []
-      const allList = await this.getAllNoRead(params, list)
-      isread(this.getUserMsgId(allList)).then(res => {
+      // const params = {
+      //   page: 0,
+      //   size: 10
+      //   // createTime: [],
+      //   // sort: 'createTime,desc'
+      // }
+      // const list = []
+      // const allList = await this.getAllNoRead(params, list)
+      FetchMyReadAll().then(res => {
         if (res) {
           this.reload()
           // this.getTableData()
+          this.$route.query.activeIndex = 1
         }
       })
     },
     // 递归获取所有列表
-    async getAllNoRead(params, list) {
-      const allList = await getUserNotice(params).then(res => {
-        list = list.concat(res.content)
-        if ((list.length) < res.totalElements) {
-          params.page++
-          return this.getAllNoRead(params, list)
-        } else {
-          return list
-        }
-      })
-      return allList
-    },
+    // async getAllNoRead(params, list) {
+    //   const allList = await FetchMyNotice(params).then(res => {
+    //     list = list.concat(res.content)
+    //     if ((list.length) < res.totalElements) {
+    //       params.page++
+    //       return this.getAllNoRead(params, list)
+    //     } else {
+    //       return list
+    //     }
+    //   })
+    //   return allList
+    // },
     // 删除
     handleDelConfirm() {
       userMsgDel(this.getUserMsgId(this.selections)).then(res => {
@@ -210,6 +210,7 @@ export default {
         } else {
           this.$message.error('删除失败')
         }
+        this.$route.query.activeIndex = 1
       })
     },
     clickRowHandler(row) {