修改监控调阅

src/views/core/task/dialog.info.vue

@@ -32,12 +32,12 @@
                           }}</el-form-item>
                       </el-col>
                       <el-col :span="12">
-                        <el-form-item prop="dueCount" label="调阅角色">{{
+                        <el-form-item prop="dueCount" label="调阅人员">{{
                             formData.roleName
                           }}</el-form-item>
                       </el-col>
                       <el-col :span="12">
-                        <el-form-item prop="dueCount" label="调阅人">{{
+                        <el-form-item prop="dueCount" label="登记人">{{
                             formData.retrievalUserName
                           }}</el-form-item>
                       </el-col>
@@ -61,9 +61,9 @@
                         <span>{{scope.$index + 1}}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="视频主机" align="center" prop="hostName" />
-                    <el-table-column label="视频通道" align="center" prop="channelName" />
-                    <el-table-column label="项目" align="center" prop="project" >
+                    <el-table-column label="硬盘录像机" align="center" prop="hostName" />
+                    <el-table-column label="通道名称" align="center" prop="channelName" />
+                    <el-table-column label="调阅项目" align="center" prop="project" >
                       <template slot-scope="scope">
                         <dict-tag :options="dict.type.core_registration_project" :value="scope.row.project"/>
                       </template>

src/views/core/task/index.vue

@@ -18,12 +18,8 @@
             :value="dict.value"
           />
         </el-select>
-      </el-form-item>
-      <el-form-item label="调阅角色" prop="roleId">
-        <el-select v-model="queryParams.roleId" placeholder="请选择">
-          <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-        </el-select>
       </el-form-item>-->
+
       <el-form-item label="任务名称" prop="taskName">
         <el-input
           v-model="queryParams.taskName"
@@ -32,6 +28,11 @@
           @keyup.enter.native="handleQuery"
           maxlength="50"  />
       </el-form-item>
+      <el-form-item label="调阅人员" prop="roleId">
+        <el-select v-model="queryParams.roleId" placeholder="请选择调阅人员" clearable>
+          <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="任务进度" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择进度" clearable>
           <el-option
@@ -88,29 +89,40 @@
         </template>
       </el-table-column>
       <el-table-column label="任务名称" align="center" prop="taskName" width="220"/>
+      <el-table-column label="调阅机构" align="center" prop="orgName"  width="220"/>
+      <el-table-column label="调阅人员" align="center" prop="roleName" width="160"/>
+      <el-table-column label="任务进度" align="center" prop="status">
+        <template slot-scope="scope">
+          <span :style="statusColor(scope.row.status)">
+          <dict-tag :options="dict.type.retrieval_task_status" :value="scope.row.status"/>
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="任务时间" align="center" width="220">
+        <template slot-scope="scope">
+          {{scope.row.planStartTime}}~{{scope.row.planEndTime}}
+        </template>
+      </el-table-column>
+
+      <el-table-column label="异常数" align="center" prop="exceptionCount" />
+
 <!--      <el-table-column label="调阅周期" align="center" prop="cycle" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_access_cycle" :value="scope.row.cycle" />
         </template>
       </el-table-column>-->
-      <el-table-column label="开始时间" align="center" prop="planStartTime" width="160">
+<!--      <el-table-column label="开始时间" align="center" prop="planStartTime" width="160">-->
 <!--        <template slot-scope="scope">
           <span>{{ parseTime(scope.row.planStartTime, '{y}-{m}-{d}') }}</span>
         </template>-->
-      </el-table-column>
-      <el-table-column label="截止时间" align="center" prop="planEndTime" width="160">
-<!--        <template slot-scope="scope">
+<!--      </el-table-column>-->
+<!--      <el-table-column label="截止时间" align="center" prop="planEndTime" width="160">
+&lt;!&ndash;        <template slot-scope="scope">
           <span>{{ parseTime(scope.row.planEndTime, '{y}-{m}-{d}') }}</span>
-        </template>-->
-      </el-table-column>
-      <el-table-column label="任务进度" align="center" prop="status">
-        <template slot-scope="scope">
-          <span :style="statusColor(scope.row.status)">
-          <dict-tag :options="dict.type.retrieval_task_status" :value="scope.row.status"/>
-          </span>
-        </template>
-      </el-table-column>
-      <el-table-column label="调阅机构" align="center" prop="orgName"  width="220"/>
+        </template>&ndash;&gt;
+      </el-table-column>-->
+
+
 
 <!--      <el-table-column label="调阅角色" align="center" prop="roleName" width="160"/>
 
@@ -120,8 +132,8 @@
       <el-table-column label="调阅结束时间" align="center" prop="endTime" width="160">
 
       </el-table-column>-->
-      <el-table-column label="调阅人" align="center" prop="retrievalUserName" width="140"/>
-      <el-table-column label="异常数" align="center" prop="exceptionCount" />
+<!--      <el-table-column label="调阅人" align="center" prop="retrievalUserName" width="140"/>-->
+
       <el-table-column label="操作" fixed="right" style="width: 100px" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -320,7 +332,7 @@ export default {
      console.log(this);
       this.download('core/retrievalTask/export', {
         ...this.queryParams
-      }, `${this.orgName+'-监控调阅任务记录-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+      }, `${'【'+this.orgName+'】-【调阅情况跟踪】-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
     },
     statusColor(status) {
       let color = "";