diff --git a/src/views/inventory/DeviceInspectMyTake.vue b/src/views/inventory/DeviceInspectMyTake.vue
index 8aba8022..cf18b68a 100644
--- a/src/views/inventory/DeviceInspectMyTake.vue
+++ b/src/views/inventory/DeviceInspectMyTake.vue
@@ -36,7 +36,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item class="query-form-item" label="预计结束时间时间:">
+            <el-form-item class="query-form-item" label="预计结束时间:">
               <el-date-picker
                   :picker-options="pickerEdOptions"
                   v-model="edDateRange"
@@ -83,8 +83,8 @@
           </template>
         </el-table-column>
         <el-table-column label="提醒时间" prop="remindTime"></el-table-column>
-        <el-table-column label="巡检人" prop="inspectName"></el-table-column>
-        <el-table-column label="预计结束时间时间" prop="expectedTime"></el-table-column>
+        <el-table-column label="负责人" prop="inspectName"></el-table-column>
+        <el-table-column label="预计结束时间" prop="expectedTime"></el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button
@@ -140,14 +140,14 @@
     <el-card class="el-card">
       <el-table v-loading="loading" :data="delectList" style="width: 100%" border highlight-current-row>
         <el-table-column label="序号" type="index" width="60"></el-table-column>
-        <el-table-column label="巡检项目编码" prop="projectCode" width="300"></el-table-column>
+        <el-table-column label="项目编码" prop="projectCode" width="300"></el-table-column>
         <el-table-column label="项目内容" prop="projectContent" width="500"></el-table-column>
         <el-table-column label="状态" prop="status" width="100">
           <template slot-scope="scope">
             <el-tag>{{ statusdetailMap[scope.row.status] }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="巡检图片" prop="inspectImage" width="300">
+        <el-table-column label="现场照片" prop="inspectImage" width="300">
           <template slot-scope="scope">
             <div style="color: #1890ff;" @click="showImgViewer(scope.row)">{{ scope.row.inspectImage }}</div>
           </template>
@@ -259,8 +259,8 @@ export default {
       },
       formName: null,
       formMap: {
-        add: "新增设备巡检任务",
-        edit: "编辑设备巡检任务",
+        add: "任务分配-新增任务",
+        edit: "任务分配-编辑任务",
         datail: "详情"
       },
       deviceInspectTake: {
diff --git a/src/views/inventory/DeviceInspectPlanAuditModify.vue b/src/views/inventory/DeviceInspectPlanAuditModify.vue
index df6ec423..ae4f8be8 100644
--- a/src/views/inventory/DeviceInspectPlanAuditModify.vue
+++ b/src/views/inventory/DeviceInspectPlanAuditModify.vue
@@ -247,7 +247,7 @@ export default {
     submit(status) {
       //判断巡检人要填
       if(status == 2 && this.inspectPlan.inspectUser == null){
-        return   this.$message.error("巡检人不能为空");
+        return   this.$message.error("负责人不能为空");
       }
       this.inspectPlan.status=status
       updateStatus(this.inspectPlan).then((res) => {
diff --git a/src/views/inventory/DeviceInspectTake.vue b/src/views/inventory/DeviceInspectTake.vue
index a93ac194..222ce5b6 100644
--- a/src/views/inventory/DeviceInspectTake.vue
+++ b/src/views/inventory/DeviceInspectTake.vue
@@ -51,16 +51,16 @@
           <el-col :span="8">
             <el-form-item label="任务状态:" class="query-form-item">
               <el-select v-model="filterQuery.status" style="width: 90%" placeholder="请选择任务状态" clearable>
-                <el-option label="未巡检" :value=2></el-option>
-                <el-option label="巡检中" :value=3></el-option>
-                <el-option label="已巡检" :value=4></el-option>
+                <el-option label="未处理" :value=2></el-option>
+                <el-option label="处理中" :value=3></el-option>
+                <el-option label="已处理" :value=4></el-option>
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item class="query-form-item" label="预计结束时间时间:">
+            <el-form-item class="query-form-item" label="预计结束时间:">
               <el-date-picker
                   :picker-options="pickerEdOptions"
                   v-model="edDateRange"
@@ -133,8 +133,8 @@
         <el-table-column label="开始时间" prop="strartTime"></el-table-column>
         <el-table-column label="结束时间" prop="endTime"></el-table-column>
         <el-table-column label="提醒时间" prop="remindTime"></el-table-column>
-        <el-table-column label="巡检人" prop="inspectName"></el-table-column>
-        <el-table-column label="预计结束时间时间" prop="expectedTime"></el-table-column>
+        <el-table-column label="负责人" prop="inspectName"></el-table-column>
+        <el-table-column label="预计结束时间" prop="expectedTime"></el-table-column>
         <el-table-column label="操作" width="170">
           <template slot-scope="scope">
             <el-button
@@ -142,7 +142,7 @@
               size="small"
               :disabled="scope.row.status != 2"
               @click.native.stop="startOrder(scope.row,3)"
-            >开始巡检
+            >开始任务
             </el-button
             >
             <el-button
@@ -150,7 +150,7 @@
               size="small"
               :disabled="scope.row.status != 3"
               @click.native.stop="startOrder(scope.row,4)"
-            >结束巡检
+            >结束任务
             </el-button
             >
             <el-button
@@ -173,7 +173,7 @@
     </el-card>
 
     <el-dialog
-        title="巡检任务确认"
+        title="我的任务-任务确认"
         :visible.sync="formVisible"
         :close-on-click-modal="false"
         :close-on-press-escape="false"
@@ -191,14 +191,14 @@
     <el-card class="el-card">
       <el-table v-loading="loading" :data="delectList" style="width: 100%"  border highlight-current-row>
         <el-table-column label="序号" type="index" width="60"></el-table-column>
-        <el-table-column label="巡检项目编码" prop="projectCode" width="300"></el-table-column>
+        <el-table-column label="项目编码" prop="projectCode" width="300"></el-table-column>
         <el-table-column label="项目内容" prop="projectContent" width="500"></el-table-column>
         <el-table-column label="状态" prop="status" width="100">
           <template slot-scope="scope">
             <el-tag>{{ statusdetailMap[scope.row.status] }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="巡检图片" prop="inspectImage" width="300">
+        <el-table-column label="现场照片" prop="inspectImage" width="300">
           <template slot-scope="scope">
             <div style="color: #1890ff;" @click="showImgViewer(scope.row)">{{ scope.row.inspectImage }}</div>
           </template>
@@ -273,9 +273,9 @@ export default {
       loading: false,
       formVisible: false,
       statusMap: {
-        2: "未巡检",
-        3: "巡检中",
-        4: "已巡检",
+        2: "未处理",
+        3: "处理中",
+        4: "已处理",
       },
       statusdetailMap: {
         1: "未开始",
@@ -285,8 +285,8 @@ export default {
       },
       formName: null,
       formMap: {
-        add: "新增设备巡检任务",
-        edit: "编辑设备巡检任务"
+        add: "任务分配-新增任务",
+        edit: "任务分配-编辑任务"
       },
       deviceInspectTake: {
         id: null,
diff --git a/src/views/inventory/DeviceInspectTakeAdd.vue b/src/views/inventory/DeviceInspectTakeAdd.vue
index 544444d9..4364e71c 100644
--- a/src/views/inventory/DeviceInspectTakeAdd.vue
+++ b/src/views/inventory/DeviceInspectTakeAdd.vue
@@ -90,10 +90,10 @@
 
         <el-row>
           <el-col :span="10">
-            <el-form-item label="巡检人:" prop="inspectUser">
+            <el-form-item label="负责人:" prop="inspectUser">
               <el-select v-model="inspectTake.inspectUser"
                          :disabled="type == 3"
-                         placeholder="委托验收人" clearable
+                         placeholder="请选择负责人" clearable
                          style="width: 90%">
                 <el-option
                     v-for="item in userList"
@@ -106,11 +106,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="项目类型:" prop="type">
+            <el-form-item label="任务类型:" prop="type">
               <el-select v-model="inspectTake.type" style="width: 90%"
                          :disabled="formName == 'edit' || type == 3 || delectList.length > 0"
                          @change="repairType"
-                         placeholder="请选择项目类型"
+                         placeholder="请选择任务类型"
               >
                 <el-option label="巡检" :value="1"></el-option>
                 <el-option label="养护" :value="2"></el-option>
@@ -192,7 +192,7 @@
             <el-tag>{{ statusMap[scope.row.status] }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="巡检图片" prop="inspectImage" width="250">
+        <el-table-column label="现场照片" prop="inspectImage" width="250">
           <template slot-scope="scope">
             <div style="color: #1890ff;" @click="showImgViewer(scope.row)">{{ scope.row.inspectImage }}</div>
           </template>
@@ -226,7 +226,7 @@
 
 
     <el-dialog
-        title="巡检任务选入"
+        title="项目选入"
         :visible.sync="inspectSelectPlanSetVisible"
         :close-on-click-modal="false"
         :close-on-press-escape="false"
@@ -441,7 +441,7 @@ export default {
         if (valid) {
           if(status == 2){
             if(isBlank(this.inspectTake.inspectUser)){
-              return this.$message.error("巡检人不能为空");
+              return this.$message.error("负责人不能为空");
             }
             if(isBlank(this.inspectTake.expectedTime)){
               return this.$message.error("预期结束时间不能为空");
diff --git a/src/views/inventory/DeviceInspectTakeAuditModify.vue b/src/views/inventory/DeviceInspectTakeAuditModify.vue
index aa63588f..a5131a65 100644
--- a/src/views/inventory/DeviceInspectTakeAuditModify.vue
+++ b/src/views/inventory/DeviceInspectTakeAuditModify.vue
@@ -12,10 +12,10 @@
               <el-select v-model="inspectTake.deptCode" placeholder="请选择部门" clearable="true"
                          :disabled="inspectTake.id !== null" @change="deptChange" style="width: 90%">
                 <el-option
-                    v-for="item in deptList"
-                    :key="item.name"
-                    :label="item.name"
-                    :value="item.code">
+                  v-for="item in deptList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
                   <span style="float: left">{{ item.name }}</span>
                 </el-option>
               </el-select>
@@ -27,10 +27,10 @@
               <el-select v-model="inspectTake.invCode" :disabled="inspectTake.id !== null" placeholder="请选择仓库"
                          clearable="true" style="width: 90%">
                 <el-option
-                    v-for="item in invList"
-                    :key="item.name"
-                    :label="item.name"
-                    :value="item.code">
+                  v-for="item in invList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
                   <span style="float: left">{{ item.name }}</span>
                 </el-option>
               </el-select>
@@ -70,10 +70,10 @@
 
         <el-row>
           <el-col :span="10">
-            <el-form-item label="项目类型:" prop="type">
+            <el-form-item label="任务类型:" prop="type">
               <el-select v-model="inspectTake.type" style="width: 90%"
                          @change="repairType"
-                         disabled placeholder="请选择项目类型" clearable="true">
+                         disabled placeholder="请选择任务类型" clearable="true">
                 <el-option label="巡检" :value="1"></el-option>
                 <el-option label="养护" :value="2"></el-option>
                 <el-option label="报修" :value="3"></el-option>
@@ -83,14 +83,14 @@
 
           </el-col>
           <el-col :span="10">
-            <el-form-item label="巡检人:" prop="inspectUser">
-              <el-select v-model="inspectTake.inspectUser" disabled placeholder="委托验收人" clearable
+            <el-form-item label="负责人:" prop="inspectUser">
+              <el-select v-model="inspectTake.inspectUser" disabled placeholder="请选择负责人" clearable
                          style="width: 90%">
                 <el-option
-                    v-for="item in userList"
-                    :key="item.userid"
-                    :label="item.employeeName"
-                    :value="item.userid">
+                  v-for="item in userList"
+                  :key="item.userid"
+                  :label="item.employeeName"
+                  :value="item.userid">
                   <span style="float: left">{{ item.employeeName }}</span>
                 </el-option>
               </el-select>
@@ -102,7 +102,7 @@
           <el-col :span="10">
             <el-form-item class="query-form-item" label="维修类型:" prop="repairType">
               <el-select v-model="inspectTake.repairType"
-                          disabled
+                         disabled
                          placeholder="请选择维修类型" style="width: 90%" clearable>
                 <el-option label="自行维修" :value=1></el-option>
                 <el-option label="外部维修" :value=2></el-option>
@@ -139,10 +139,13 @@
 
       <el-row type="flex" justify="end">
         <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 10px">
-            <el-button type="primary" @click.native.stop="selectPlanFunction(null)" v-if="type != 5" :loading="loading">选入</el-button>
-          </el-button-group>
+          <el-button type="primary" @click.native.stop="selectPlanFunction(null)" v-if="type != 5" :loading="loading">
+            选入
+          </el-button>
+        </el-button-group>
         <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
-          <el-button type="primary" @click.native.stop="setPlanFunction(null)" :loading="loading" v-if="type != 5">新增</el-button>
+          <el-button type="primary" @click.native.stop="setPlanFunction(null)" :loading="loading" v-if="type != 5">新增
+          </el-button>
         </el-button-group>
       </el-row>
 
@@ -155,7 +158,7 @@
             <el-tag>{{ statusMap[scope.row.status] }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="巡检图片" prop="inspectImage" width="250">
+        <el-table-column label="现场照片" prop="inspectImage" width="250">
           <template slot-scope="scope">
             <div style="color: #1890ff;" @click="showImgViewer(scope.row)">{{ scope.row.inspectImage }}</div>
           </template>
@@ -173,35 +176,35 @@
     </el-card>
 
     <el-dialog
-        :title="name"
-        :visible.sync="inspectTakeSetVisible"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        width="45%"
-        append-to-body
-        v-if="inspectTakeSetVisible"
+      :title="name"
+      :visible.sync="inspectTakeSetVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="45%"
+      append-to-body
+      v-if="inspectTakeSetVisible"
     >
       <DeviceInspectTakeProjectSet
-          :inputQuery="inputQuery"
-          :editType="editType"
-          :type="type"
-          :closeDialog="inspectTakeSetCloseDialog"
+        :inputQuery="inputQuery"
+        :editType="editType"
+        :type="type"
+        :closeDialog="inspectTakeSetCloseDialog"
       ></DeviceInspectTakeProjectSet>
     </el-dialog>
 
     <el-dialog
-        title="巡检任务选入"
-        :visible.sync="inspectSelectPlanSetVisible"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        width="80%"
-        append-to-body
-        v-if="inspectSelectPlanSetVisible"
+      title="项目选入"
+      :visible.sync="inspectSelectPlanSetVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="80%"
+      append-to-body
+      v-if="inspectSelectPlanSetVisible"
     >
       <DeviceProjectSelectTake
-          :inputQuery="inputQuery"
-          :type="inspectTake.type"
-          :closeDialog="inspectTakeSetCloseDialog"
+        :inputQuery="inputQuery"
+        :type="inspectTake.type"
+        :closeDialog="inspectTakeSetCloseDialog"
       ></DeviceProjectSelectTake>
     </el-dialog>
 
@@ -249,7 +252,7 @@ export default {
       invList: [],
       userList: [],
       imgList: [],
-      name:'',
+      name: '',
       isColse: false,
       BASE_URL: process.env.VUE_APP_BASE_API,
       editType: null,
@@ -274,7 +277,7 @@ export default {
         updateTime: null,
         taskOrderIdFk: null
       },
-      ischeck:false,
+      ischeck: false,
       deviceList: [],
       delectList: [],
       deviceTotal: 0,
@@ -307,12 +310,12 @@ export default {
     getInvList() {
       let params = {deptCode: this.inspectTake.deptCode};
       getInvListByUser(params)
-          .then((response) => {
-            this.invList = response.data || [];
-            this.getList();
-          })
-          .catch(() => {
-          });
+        .then((response) => {
+          this.invList = response.data || [];
+          this.getList();
+        })
+        .catch(() => {
+        });
     },
     submit(status) {
       //判断状态
@@ -342,11 +345,11 @@ export default {
     },
 
     //!--------------------------------------------------------------   新加方法           --------------------------------------------------------- //
-    repairType(val){
-      if(val == 3){
+    repairType(val) {
+      if (val == 3) {
         //报修
         this.ischeck = true;
-      }else
+      } else
         this.ischeck = false;
     },
     delectPlanFunction(row) {
@@ -403,7 +406,7 @@ export default {
             updateTime: null,
             taskOrderIdFk: null
           },
-          this.inputQuery.status = 1
+            this.inputQuery.status = 1
           this.inputQuery.inspectUser = this.inspectTake.inspectUser
           this.inputQuery.taskOrderIdFk = this.inspectTake.orderId
         } else {
@@ -415,9 +418,9 @@ export default {
         this.inspectTakeSetVisible = true;
       }
     },
-    selectPlanFunction(row){
+    selectPlanFunction(row) {
       if (this.inspectTake.orderId != null) { //edit
-        if(isBlank(row)){
+        if (isBlank(row)) {
           this.inputQuery = {
             id: null,
             projectCode: null,
@@ -429,12 +432,12 @@ export default {
             updateTime: null,
             taskOrderIdFk: null
           },
-          this.inputQuery.inspectUser = this.inspectTake.inspectUser
+            this.inputQuery.inspectUser = this.inspectTake.inspectUser
           this.inputQuery.taskOrderIdFk = this.inspectTake.orderId
-        }else{
+        } else {
           this.inputQuery = row
         }
-      }else{
+      } else {
         this.inputQuery.taskOrderIdFk = this.inspectTake.orderId
       }
       this.inspectSelectPlanSetVisible = true;
@@ -485,16 +488,16 @@ export default {
       this.selectDeviceInspecTakeDetail({taskOrderIdFk: this.inspectTake.orderId});
       this.inspectTakeSetVisible = false
       this.inspectSelectPlanSetVisible = false
-      if(isBlank(obj)){
-        var count=0;
+      if (isBlank(obj)) {
+        var count = 0;
         if (this.type == 4) {
           for (var i = 0; i < this.delectList.length; i++) {
             if (this.delectList[i].status != 2) {
               count++;
             }
           }
-          if(count == 0){
-            return  this.$message.success("任务已全部完成")
+          if (count == 0) {
+            return this.$message.success("任务已全部完成")
           }
         }
       }
@@ -502,7 +505,7 @@ export default {
   }
   ,
   components: {
-    DeviceInspectTakeProjectSet, ElImageViewer ,DeviceProjectSelectTake
+    DeviceInspectTakeProjectSet, ElImageViewer, DeviceProjectSelectTake
   }
   ,
   created() {
@@ -510,8 +513,8 @@ export default {
     this.getUserBus();
     if (!isBlank(this.inspectTake.id)) {
       this.selectDeviceInspecTakeDetail({taskOrderIdFk: this.inspectTake.orderId});
-      if(this.inspectTake.type == 3){
-        this.ischeck =true
+      if (this.inspectTake.type == 3) {
+        this.ischeck = true
       }
     }
   }
diff --git a/src/views/inventory/DeviceInspectTakeProjectSet.vue b/src/views/inventory/DeviceInspectTakeProjectSet.vue
index c539ed07..3c29e864 100644
--- a/src/views/inventory/DeviceInspectTakeProjectSet.vue
+++ b/src/views/inventory/DeviceInspectTakeProjectSet.vue
@@ -36,7 +36,7 @@
         </el-row>
         <el-row v-if="editType != 2">
           <el-col :span="11">
-            <el-form-item label="巡检图片:">
+            <el-form-item label="现场照片:">
               <el-upload
                   class="upload-demo"
                   ref="upload"
@@ -56,7 +56,7 @@
                     size="small"
                     type="primary"
                 >
-                  巡检图片
+                  现场照片
                 </el-button>
                 <div>只能上传 jpg,png,pdf,doc 文件，且不超过 10 MB</div>
               </el-upload>
diff --git a/src/views/inventory/DeviceInspectTakeSelect.vue b/src/views/inventory/DeviceInspectTakeSelect.vue
index b1b73c6e..4d3cc99b 100644
--- a/src/views/inventory/DeviceInspectTakeSelect.vue
+++ b/src/views/inventory/DeviceInspectTakeSelect.vue
@@ -46,7 +46,7 @@
 
         <el-row>
           <el-col :span="8">
-            <el-form-item class="query-form-item" label="预计结束时间时间:">
+            <el-form-item class="query-form-item" label="预计结束时间:">
               <el-date-picker
                   :picker-options="pickerEdOptions"
                   v-model="edDateRange"
@@ -107,9 +107,9 @@
               <el-select v-model="filterQuery.status" style="width: 90%" placeholder="请选择任务状态" clearable>
                 <el-option label="草稿" :value=0></el-option>
                 <el-option label="未分配" :value=1></el-option>
-                <el-option label="未巡检" :value=2></el-option>
-                <el-option label="巡检中" :value=3></el-option>
-                <el-option label="已巡检" :value=4></el-option>
+                <el-option label="未处理" :value=2></el-option>
+                <el-option label="处理中" :value=3></el-option>
+                <el-option label="已处理" :value=4></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -142,8 +142,8 @@
         <el-table-column label="开始时间" prop="strartTime" width="150"></el-table-column>
         <el-table-column label="结束时间" prop="endTime" width="150"> </el-table-column>
         <el-table-column label="提醒时间" prop="remindTime" width="150"></el-table-column>
-        <el-table-column label="巡检人" prop="inspectName" width="150"></el-table-column>
-        <el-table-column label="预计结束时间时间" prop="expectedTime" width="150"></el-table-column>
+        <el-table-column label="负责人" prop="inspectName" width="150"></el-table-column>
+        <el-table-column label="预计结束时间" prop="expectedTime" width="150"></el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button
@@ -184,14 +184,14 @@
     <el-card class="el-card">
       <el-table v-loading="loading" :data="delectList" style="width: 100%"  border highlight-current-row>
         <el-table-column label="序号" type="index" width="60"></el-table-column>
-        <el-table-column label="巡检项目编码" prop="projectCode" width="300"></el-table-column>
+        <el-table-column label="项目编码" prop="projectCode" width="300"></el-table-column>
         <el-table-column label="项目内容" prop="projectContent" width="500"></el-table-column>
         <el-table-column label="状态" prop="status" width="100">
           <template slot-scope="scope">
             <el-tag>{{ statusdetailMap[scope.row.status] }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="巡检图片" prop="inspectImage" width="300">
+        <el-table-column label="现场照片" prop="inspectImage" width="300">
           <template slot-scope="scope">
             <div style="color: #1890ff;" @click="showImgViewer(scope.row)">{{ scope.row.inspectImage }}</div>
           </template>
@@ -267,9 +267,9 @@ export default {
       statusMap: {
         0: "草稿",
         1: "未分配",
-        2: "未巡检",
-        3: "巡检中",
-        4: "已巡检",
+        2: "未处理",
+        3: "处理中",
+        4: "已处理",
       },
       statusdetailMap: {
         1: "未开始",
@@ -279,8 +279,8 @@ export default {
       },
       formName: null,
       formMap: {
-        add: "新增设备巡检任务",
-        edit: "编辑设备巡检任务"
+        add: "任务分配-新增任务",
+        edit: "任务分配-编辑任务"
       },
       deviceInspectTake: {
         id: null,