coys vor 2 Jahren
Ursprung
Commit
a99e831824
2 geänderte Dateien mit 80 neuen und 72 gelöschten Zeilen
  1. 15 8
      src/api/toConsult.js
  2. 65 64
      src/views/menu/monitoringCall/index.vue

+ 15 - 8
src/api/toConsult.js

@@ -1,7 +1,6 @@
 // 调阅相关接口
 import request from '@/utils/request'
 
-// 获取调阅列表
 export function login(data) {
   return request({
     url: '/auth/login',
@@ -12,13 +11,21 @@ export function login(data) {
     data
   })
 }
+// 重新调阅
+export function resetTask(id) {
+  return request({
+    url: `/core/retrievalTask/initialization/${id}`,
+
+    method: 'get'
+  })
+}
 // 获取调阅列表
 export function selectListApp(data) {
   return request({
     url: '/core/retrievalTask/selectListApp',
-    
+
     method: 'get',
-    params:data
+    params: data
   })
 }
 
@@ -44,8 +51,8 @@ export function registrationList(query) {
 //获取任务主机以及通道
 export function getSysDeviceByTaskId(query) {
   return request({
-    url: '/system/device/getSysDeviceByTaskId/'+query.taskId,
-    method: 'get',
+    url: '/system/device/getSysDeviceByTaskId/' + query.taskId,
+    method: 'get'
     // params: query
   })
 }
@@ -69,7 +76,7 @@ export function getorgHost(query) {
   return request({
     url: `/system/device/getSysDeviceByOrgId`,
     method: 'get',
-    params:query
+    params: query
   })
 }
 // 通过主机ID获取通道列表
@@ -77,7 +84,7 @@ export function getSysDeviceByHostId(query) {
   return request({
     url: `/system/device/getSysDeviceByHostId`,
     method: 'get',
-    params:query
+    params: query
   })
 }
 // 添加
@@ -101,7 +108,7 @@ export function getEditInfo(query) {
   return request({
     url: `/core/info/getInfo`,
     method: 'get',
-    params:query
+    params: query
   })
 }
 //结束调阅

+ 65 - 64
src/views/menu/monitoringCall/index.vue

@@ -1,9 +1,9 @@
 <template>
   <div>
-    <NavBar :go="{type:'push',path:'/menu'}" />
+    <NavBar :go="{ type: 'push', path: '/menu' }" />
     <van-row>
       <van-col span="24">
-        <org-tree v-model="cascaderValue" @change="getDataList" ></org-tree>
+        <org-tree v-model="cascaderValue" @change="getDataList"></org-tree>
       </van-col>
     </van-row>
     <van-row>
@@ -15,7 +15,9 @@
           :disabled="showStatus"
           label="状态"
           placeholder=""
-          @click="showStatus = true" ><van-icon name="arrow-down" slot="button" /></van-field>
+          @click="showStatus = true"
+          ><van-icon name="arrow-down" slot="button"
+        /></van-field>
         <van-popup v-model="showStatus" round position="bottom">
           <van-picker
             title="调阅状态"
@@ -36,7 +38,8 @@
           label="月份"
           placeholder=""
           @click="showDate = true"
-        ><van-icon name="arrow-down" slot="button" /></van-field>
+          ><van-icon name="arrow-down" slot="button"
+        /></van-field>
         <van-popup v-model="showDate" round position="bottom">
           <van-datetime-picker
             v-model="presentDate"
@@ -48,7 +51,6 @@
           />
         </van-popup>
       </van-col>
-
     </van-row>
     <!-- 调阅列表 -->
     <div class="bigbox">
@@ -59,17 +61,23 @@
             v-for="item in taskList"
             :key="item.id"
             size="large"
-            :label="item.planStartTime+'~'+item.planEndTime"
-            :is-link="item.status!=3"
-            @click="linkHandler(item.status,item.id,item)"
+            :label="item.planStartTime + '~' + item.planEndTime"
+            :is-link="item.status != 3"
           >
             <template #title>
-              <span class="custom-title">{{ item.taskName }}</span>
-              <span :class="monitor[item.status]">{{ item.status | statusFilter(this_) }}</span>
+              <span class="custom-title"
+                >{{ item.taskName
+                }}<van-tag class="resetDy" @click="resetHandler(item.id)" v-if="item.status == 1" type="primary"
+                  >重新调阅</van-tag
+                ></span
+              >
+
+              <span @click="linkHandler(item.status, item.id, item)" :class="monitor[item.status]">{{
+                item.status | statusFilter(this_)
+              }}</span>
             </template>
           </van-cell>
         </van-cell-group>
-        
       </van-list>
     </div>
 
@@ -80,7 +88,7 @@
 <script>
 import NavBar from '@/components/NavBar'
 import { Col, Row, Cascader, Dialog, DatetimePicker, Icon, Picker } from 'vant'
-import { deptTreeList, selectListApp, registration } from '@/api/toConsult.js'
+import { deptTreeList, selectListApp, registration,resetTask } from '@/api/toConsult.js'
 import { Toast } from 'vant'
 import OrgTree from '@/components/orgTree'
 import { newDateMonth } from '@/utils/date.js'
@@ -145,8 +153,6 @@ export default {
     }
   },
   created() {
-    
-
     this.presentDate = this.presentDateCpd
   },
   computed: {
@@ -154,44 +160,49 @@ export default {
       return new Date(+newDateMonth().split('-')[0], +newDateMonth().split('-')[1] - 1)
     }
   },
-  created(){
+  created() {
     this.init()
   },
   mounted() {
     this.cascaderValue = JSON.parse(window.sessionStorage.getItem('SET_USER_ORGID')) + ''
-    
-   
-  },
-  updated(){
-   
-      // this.cascaderValue = JSON.parse(window.sessionStorage.getItem('SET_USER_ORGID')) + ''
-   
   },
   methods: {
-   
     //单元格点击事件
-    linkHandler(status,id,item){
-      
-      if(status==0){
-       
+    linkHandler(status, id, item) {
+      if (status == 0) {
         //判断当前时间是否小于开始时间 小于则不能进行操作
         let date = new Date().getTime()
         let startDate = Date.parse(new Date(item.planStartTime))
-       
-        if(date<=startDate){
-          Toast.success('当前调阅任务还未开始,不能进行调阅')
-        }else{
 
+        if (date <= startDate) {
+          Toast.success('当前调阅任务还未开始,不能进行调阅')
+        } else {
           this.startMonitorHandler(id)
         }
       }
-      if(status!=0&&status!=3){
-        this.lookInfoHandler(id,status)
+      if (status == 3) {
+        return Toast('当前调阅任务已逾期,不能进行调阅操作!')
+      }
+      if (status != 0 && status != 3) {
+        this.lookInfoHandler(id, status)
       }
     },
+    //重新调阅
+    resetHandler(id) {
+      Dialog.confirm({
+        title: '提示',
+        message: '确认要对该任务进行重新调阅吗?'
+      }).then(() => {
+        resetTask(id).then(res=>{
+          if(res.code==200){
+            Toast.success('初始化任务成功')
+            this.selectListAppHandler()
+          }
+        })
+      })
+    },
     //机构变化
     getDataList(v) {
-      
       this.cascaderValue = v
       this.selectListAppHandler()
     },
@@ -239,7 +250,7 @@ export default {
         pageNum: this.pageNum,
         pageSize: 10,
         status: this.str || '',
-        orgId: this.cascaderValue ||JSON.parse(window.sessionStorage.getItem('SET_USER_ORGID'))+''|| '',
+        orgId: this.cascaderValue || JSON.parse(window.sessionStorage.getItem('SET_USER_ORGID')) + '' || '',
         moth: this.currentDate || ''
       }).then(res => {
         let { code, rows, msg } = res
@@ -255,11 +266,6 @@ export default {
             this.finished = false
             this.taskList = rows
           }
-
-          // if(num===1){
-          //   this.loading = false
-          //   this.pageNum++
-          // }
         }
       })
     },
@@ -304,8 +310,6 @@ export default {
       formData.append('file', base64ToBlob(img.base))
       upload(formData, 'image')
         .then(res => {
-          
-          
           /*上传成功*/
           let imgUrl = process.env.NODE_ENV === 'development' ? res.data.url : window.origin + res.data.url
           this.photoHandler(imgUrl)
@@ -354,8 +358,8 @@ export default {
           this.str = item.dictValue
         }
       })
-      if(value=='全部'){
-        this.str =''
+      if (value == '全部') {
+        this.str = ''
       }
       this.showStatus = false
       this.selectListAppHandler()
@@ -376,12 +380,6 @@ export default {
       d = d < 10 ? '0' + d : d
       return y + '-' + m
     },
-    // //日期组件change
-    // changeHandler(Picker){
-    //   console.log(Picker);
-    //   console.log(Picker.getValues());
-    //   debugger
-    // },
     onChange(picker, value, index) {},
     onCancel() {
       this.show = false
@@ -403,17 +401,17 @@ export default {
     background-color: #fff;
   }
 }
-.custom-title{
+.custom-title {
   font-weight: bold;
 }
-.van-cell__label{
-  font-size: 20px;
+.van-cell__label {
+  font-size: 25px;
 }
 .monitor {
   color: #1989fa;
   padding-left: 10px;
   padding-right: 10px;
- 
+
   float: right;
   // font-size: 20px;
   // border-radius: 10px;
@@ -426,7 +424,7 @@ export default {
   padding-right: 10px;
   float: right;
   // font-size: 20px;
-  
+
   // border-radius: 10px;
   // background-color: #1989fa;
 }
@@ -440,12 +438,12 @@ export default {
   // background-color: #25da0b;
 }
 .waringtoring {
-  color:  #f16363;
-  
+  color: #f16363;
+
   padding-left: 10px;
   padding-right: 10px;
   float: right;
-  
+
   // font-size: 20px;
   // border-radius: 10px;
   // background-color: #e46962;
@@ -565,14 +563,17 @@ export default {
   border: none;
 }
 
-:deep.van-field--disabled{
+:deep.van-field--disabled {
+  color: #323233;
+}
+:deep.van-field--disabled .van-field__label {
   color: #323233;
 }
-:deep.van-field--disabled .van-field__label{
+:deep .van-field__control[disabled] {
   color: #323233;
+  -webkit-text-fill-color: #323233;
+}
+.resetDy {
+  margin-left: 20px;
 }
-:deep .van-field__control[disabled]{
-			color: #323233;
-			-webkit-text-fill-color: #323233;
-		}
 </style>