任务下发问题修改 gengdidi

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TWorkOrder.java

@@ -94,8 +94,8 @@ public class TWorkOrder extends BaseEntity
     private String responsiblePerson;
 
     /** 截止日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "截止日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "截止日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date expiryDate;
 
     /** 是否删除(0正常，1删除) */

gassafetyprogress-web/src/views/operationMonitor/workOrder/index.vue → gassafetyprogress-web/src/views/inspectionWork/workOrder/index.vue

@@ -186,7 +186,7 @@
             <el-select v-model="form.workType" placeholder="请选择任务类型" style="width: 350px" :disabled="isDetail">
               <el-option label="入户安检" value="1" />
               <el-option label="巡检" value="2" />
-              <el-option label="报警巡查" value="3" />
+              <!--<el-option label="报警巡查" value="3" />-->
               <el-option label="其他" value="4" />
             </el-select>
           </el-form-item>
@@ -284,8 +284,8 @@
       <el-form-item label="截止日期" prop="expiryDate">
         <el-date-picker clearable size="small"
                         v-model="form.expiryDate"
-                        type="date"
-                        value-format="yyyy-MM-dd"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
                         placeholder="选择截止日期" style="width: 350px" :disabled="isDetail">
         </el-date-picker>
       </el-form-item>
@@ -606,7 +606,7 @@ export default {
       this.reset();
       this.open = true;
       this.isDetail = false;
-      this.title = "添加燃气任务";
+      this.title = "添加巡检巡查任务";
       this.getEnterpriseLists();
     },
     /** 修改按钮操作 */

gassafetyprogress-web/src/views/operationMonitor/gassVehicle/index.vue

@@ -49,7 +49,7 @@
                 icon="el-icon-map-location"
                 @click="getVehicleTravel(scope.row)"
                 v-hasPermi="['system:info:remove']"
-              >车辆轨迹</el-button>
+              >车辆位置</el-button>
             </template>
           </el-table-column>
         </el-table>