diff --git a/src/api/inspection/inspectiontasks.js b/src/api/inspection/inspectiontasks.js
index 76cf3a4..4a0b876 100644
--- a/src/api/inspection/inspectiontasks.js
+++ b/src/api/inspection/inspectiontasks.js
@@ -48,3 +48,23 @@ export const update = (row) => {
   })
 }
 
+export const action = (ids) => {
+  return request({
+    url: '/api/inspection/inspectiontasks/action',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const stop = (ids) => {
+  return request({
+    url: '/api/inspection/inspectiontasks/stop',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
diff --git a/src/views/inspection/inspectiontasks.vue b/src/views/inspection/inspectiontasks.vue
index 4470460..34de3cd 100644
--- a/src/views/inspection/inspectiontasks.vue
+++ b/src/views/inspection/inspectiontasks.vue
@@ -8,6 +8,7 @@
                :before-open="beforeOpen"
                v-model="form"
                ref="crud"
+               :header-cell-class-name="headerClass"
                @row-update="rowUpdate"
                @row-save="rowSave"
                @row-del="rowDel"
@@ -23,22 +24,53 @@
                    icon="el-icon-delete"
                    plain
                    v-if="permission.inspectiontasks_delete"
-                   @click="handleDelete">删 除
+                   @click="handleDelete">批量删除
         </el-button>
       </template>
+      <template slot="menuRight">
+        <el-button type="primary"
+                   size="small"
+                   plain
+                   @click="handleDetailAdd">新增
+        </el-button>
+        <el-button type="primary"
+                   size="small"
+                   plain
+                   @click="handleAction">启动
+        </el-button>
+        <el-button type="primary"
+                   size="small"
+                   plain
+                   @click="handleStop">停止
+        </el-button>
+        <el-button type="primary"
+                   size="small"
+                   plain
+                   @click="handleExport()">导出
+        </el-button>
+      </template>
+      <template #menu="{row,index,size}">
+        <el-button @click="handleDetailSearch(row,index)" type="text">详情</el-button>
+        <el-button @click="resultAdd(row,index)" type="text">上传巡检结果</el-button>
+        <el-button @click="rowDel(row)" type="text">删除</el-button>
+      </template>
     </avue-crud>
   </basic-container>
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove} from "@/api/inspection/inspectiontasks";
+  import {getList, getDetail, add, remove, action, stop} from "@/api/inspection/inspectiontasks";
   import {mapGetters} from "vuex";
+  import {auditing, reject} from "@/api/leger/equipmentledger";
+  import expUtil from "@/util/exportUtil";
+  import {getToken} from "@/util/auth";
 
   export default {
     data() {
       return {
         form: {},
         query: {},
+        search:{},
         loading: true,
         page: {
           pageSize: 10,
@@ -53,112 +85,134 @@
           searchMenuSpan: 6,
           tip: false,
           border: true,
-          index: true,
+          index: false,
           viewBtn: true,
           selection: true,
           column: [
             {
-              label: "主键",
-              prop: "id",
+              label: "任务编号",
+              prop: "taskNo",
+              search: true,
               rules: [{
                 required: true,
-                message: "请输入主键",
+                message: "请输入任务编号",
                 trigger: "blur"
               }]
             },
             {
-              label: "巡检对象主键",
-              prop: "inspectionObjId",
+              label: "任务名称",
+              prop: "taskName",
+              search: true,
               rules: [{
                 required: true,
-                message: "请输入巡检对象主键",
+                message: "请输入任务名称",
                 trigger: "blur"
               }]
             },
             {
-              label: "巡检路线主键",
-              prop: "inspectionRouteId",
+              label: "场站",
+              prop: "station",
+              type: "select",
+              search: true,
+              dicUrl: "/api/daf-system/dict/dictionary?code=station",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
               rules: [{
                 required: true,
-                message: "请输入巡检路线主键",
+                message: "请输入场站",
                 trigger: "blur"
               }]
             },
             {
-              label: "巡检计划主键",
-              prop: "inspectionPlanId",
+              label: "任务生成日期",
+              prop: "taskStartDate",
+              search: true,
               rules: [{
                 required: true,
-                message: "请输入巡检计划主键",
+                message: "请输入任务生成日期",
                 trigger: "blur"
               }]
             },
             {
-              label: "任务名称",
-              prop: "taskName",
+              label: "任务完成日期",
+              prop: "taskEndDate",
+              search: true,
               rules: [{
                 required: true,
-                message: "请输入任务名称",
+                message: "请输入任务完成日期",
                 trigger: "blur"
               }]
             },
             {
-              label: "场站",
-              prop: "station",
+              label: "责任人",
+              prop: "responsiblePerson",
+              search: true,
               rules: [{
                 required: true,
-                message: "请输入场站",
+                message: "请输入责任人",
                 trigger: "blur"
               }]
             },
             {
-              label: "责任人",
-              prop: "responsiblePerson",
+              label: "状态",
+              prop: "taskStatus",
+              search: true,
+              dicUrl: "/api/daf-system/dict/dictionary?code=task_status",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
               rules: [{
                 required: true,
-                message: "请输入责任人",
+                message: "请输入任务状态",
                 trigger: "blur"
               }]
             },
             {
-              label: "任务生成日期时间",
-              prop: "taskStartDate",
+              label: "取消原因",
+              prop: "cancelReason",
               rules: [{
                 required: true,
-                message: "请输入任务生成日期时间",
+                message: "请输入取消原因",
                 trigger: "blur"
               }]
             },
             {
-              label: "任务结束日期时间",
-              prop: "taskEndDate",
+              label: "巡检对象主键",
+              prop: "inspectionObjId",
+              hide: true,
               rules: [{
                 required: true,
-                message: "请输入任务结束日期时间",
+                message: "请输入巡检对象主键",
                 trigger: "blur"
               }]
             },
             {
-              label: "取消原因",
-              prop: "cancelReason",
+              label: "巡检路线主键",
+              prop: "inspectionRouteId",
+              hide: true,
               rules: [{
                 required: true,
-                message: "请输入取消原因",
+                message: "请输入巡检路线主键",
                 trigger: "blur"
               }]
             },
             {
-              label: "任务状态",
-              prop: "taskStatus",
+              label: "巡检计划主键",
+              prop: "inspectionPlanId",
+              hide: true,
               rules: [{
                 required: true,
-                message: "请输入任务状态",
+                message: "请输入巡检计划主键",
                 trigger: "blur"
               }]
             },
             {
               label: "对象名称",
               prop: "objectName",
+              hide: true,
               rules: [{
                 required: true,
                 message: "请输入对象名称",
@@ -168,6 +222,7 @@
             {
               label: "对象类型",
               prop: "objectType",
+              hide: true,
               rules: [{
                 required: true,
                 message: "请输入对象类型",
@@ -177,6 +232,7 @@
             {
               label: "路线名称",
               prop: "routeName",
+              hide: true,
               rules: [{
                 required: true,
                 message: "请输入路线名称",
@@ -186,6 +242,7 @@
             {
               label: "路线类型",
               prop: "routeType",
+              hide: true,
               rules: [{
                 required: true,
                 message: "请输入路线类型",
@@ -195,6 +252,7 @@
             {
               label: "计划名称",
               prop: "planName",
+              hide: true,
               rules: [{
                 required: true,
                 message: "请输入计划名称",
@@ -204,6 +262,7 @@
             {
               label: "计划类型",
               prop: "planType",
+              hide: true,
               rules: [{
                 required: true,
                 message: "请输入计划类型",
@@ -218,14 +277,14 @@
     computed: {
       ...mapGetters(["permission"]),
       permissionList() {
-          this.option.column = this.option.column.filter(v => {
-              return this.permission['inspectiontasks_col_' + v.prop]
-          })
+          // this.option.column = this.option.column.filter(v => {
+          //     return this.permission['inspectiontasks_col_' + v.prop]
+          // })
         return {
-          addBtn: this.vaildData(this.permission.inspectiontasks_add, false),
-          viewBtn: this.vaildData(this.permission.inspectiontasks_view, false),
-          delBtn: this.vaildData(this.permission.inspectiontasks_delete, false),
-          editBtn: this.vaildData(this.permission.inspectiontasks_edit, false)
+          addBtn: false,
+          viewBtn: false,
+          delBtn: false,
+          editBtn: false
         };
       },
       ids() {
@@ -250,19 +309,6 @@
           loading();
         });
       },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
-          done();
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-        }, error => {
-          window.console.log(error);
-          loading();
-        });
-      },
       rowDel(row) {
         this.$confirm("确定将选择数据删除?", {
           confirmButtonText: "确定",
@@ -280,6 +326,33 @@
             });
           });
       },
+      handleDetailAdd() {
+        this.$router.push({
+          path: "/inspection/inspectiontasksDetail",
+          query: {
+            frameMode:"add"
+          },
+        });
+      },
+      handleDetailSearch(row) {
+        debugger
+        this.$router.push({
+          path: "/inspection/inspectiontasksDetail",
+          query: {
+            frameMode:"search",
+            id: row.id
+          },
+        });
+      },
+      resultAdd(row) {
+        this.$router.push({
+          path: "/inspection/inspectionresult",
+          query: {
+            frameMode:"add",
+            id: row.id
+          },
+        });
+      },
       handleDelete() {
         if (this.selectionList.length === 0) {
           this.$message.warning("请选择至少一条数据");
@@ -302,6 +375,59 @@
             this.$refs.crud.toggleSelection();
           });
       },
+      handleAction() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("是否将选择巡检任务启动?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return action(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      handleStop() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("是否将选择巡检任务停止?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return stop(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      handleExport() {
+        this.$confirm("是否导出数据?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          expUtil.excelExport(`/api/inspection/inspectiontasks/export?daf-auth=${getToken()}`, this.search, ['station', 'taskStatus']);
+        });
+      },
       beforeOpen(done, type) {
         if (["edit", "view"].includes(type)) {
           getDetail(this.form.id).then(res => {
@@ -342,10 +468,17 @@
           this.loading = false;
           this.selectionClear();
         });
+      },
+      headerClass() {
+        return 'header-class'
       }
     }
   };
 </script>
 
 <style>
+.header-class{
+  background-color: #3366cc !important;
+  color: #FFFFFF !important;
+}
 </style>
diff --git a/src/views/inspection/inspectiontasksDetail.vue b/src/views/inspection/inspectiontasksDetail.vue
new file mode 100644
index 0000000..fa8c140
--- /dev/null
+++ b/src/views/inspection/inspectiontasksDetail.vue
@@ -0,0 +1,451 @@
+<template>
+  <basic-container>
+    <avue-tabs :option="option"
+               @change="handleChange"></avue-tabs>
+    <span v-if="type.prop==='information'">
+    <avue-crud :option="information_option"
+               v-model="information_form"
+               ref="information_from"
+               :class="frame_class">
+    </avue-crud>
+    </span>
+    <span v-else-if="type.prop==='result'">
+      <avue-crud :data="parameters_data"
+                     :table-loading="loading"
+                     :option="optionParam"
+                     :permission="permissionList"
+                     :before-open="beforeOpen"
+                     :header-cell-class-name="headerClass"
+                     v-model="parameters_form"
+                     ref="crud"
+                     @row-del="parameters_rowDel"
+                     @row-update="parameters_rowUpdate"
+                     @row-save="parameters_rowSave">
+      </avue-crud>
+      </span>
+    <div class="container">
+       <span >
+          <el-button type="primary"
+                     size="large"
+                     @click="handleFormSubmit"
+                     v-if="addUpdateShowButton">
+                     确定</el-button>
+       </span>
+    </div>
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, add, update, remove} from "@/api/inspection/inspectiontasks";
+  import {mapGetters} from "vuex";
+  import {auditing, reject} from "@/api/leger/equipmentledger";
+  import expUtil from "@/util/exportUtil";
+  import {getToken} from "@/util/auth";
+
+  export default {
+    name: "inspectiontasksDetail",
+    data() {
+      return {
+        frame_class: '',
+        type: {},
+        readonlyForm:{},
+        option: {
+          column: [{
+            label: '基本信息',
+            prop: 'information',
+          }
+          ]
+        },
+        information_form: {},
+        information_option: {
+          submitBtn: false,
+          emptyBtn: false,
+          column: [
+            {
+              label: "任务编号",
+              prop: "id",
+              span: 6,
+              maxlength: 20,
+              rules: [{
+                required: true,
+                message: "请输入主键",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "任务名称",
+              prop: "taskName",
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入任务名称",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "场站",
+              prop: "station",
+              search: true,
+              dicUrl: "/api/daf-system/dict/dictionary?code=station",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              rules: [{
+                required: true,
+                message: "请输入场站",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "任务生成日期",
+              prop: "taskStartDate",
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入任务生成日期",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "任务完成日期",
+              prop: "taskEndDate",
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入任务完成日期",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "责任人",
+              prop: "responsiblePerson",
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入责任人",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "状态",
+              prop: "taskStatus",
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入任务状态",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "取消原因",
+              prop: "cancelReason",
+              rules: [{
+                required: true,
+                message: "请输入取消原因",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "巡检对象主键",
+              prop: "inspectionObjId",
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入巡检对象主键",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "巡检路线主键",
+              prop: "inspectionRouteId",
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入巡检路线主键",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "巡检计划主键",
+              prop: "inspectionPlanId",
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入巡检计划主键",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "对象名称",
+              prop: "objectName",
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入对象名称",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "对象类型",
+              prop: "objectType",
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入对象类型",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "路线名称",
+              prop: "routeName",
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入路线名称",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "路线类型",
+              prop: "routeType",
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入路线类型",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "计划名称",
+              prop: "planName",
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入计划名称",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "计划类型",
+              prop: "planType",
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入计划类型",
+                trigger: "blur"
+              }]
+            },
+          ]
+        },
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+          // this.option.column = this.option.column.filter(v => {
+          //     return this.permission['inspectiontasks_col_' + v.prop]
+          // })
+        return {
+          addBtn: false,
+          viewBtn: false,
+          delBtn: false,
+          editBtn: false
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+      rowSave(row, done, loading) {
+        add(row).then(() => {
+          done();
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        }, error => {
+          window.console.log(error);
+          loading();
+        });
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      handleDetailAdd() {
+        this.$router.push({
+          path: "/inspection/inspectiontasksDetail",
+          query: {
+            frameMode:"add"
+          },
+        });
+      },
+      handleDetailSearch(row) {
+        debugger
+        this.$router.push({
+          path: "/inspection/inspectiontasksDetail",
+          query: {
+            frameMode:"search",
+            id: row.id
+          },
+        });
+      },
+      resultAdd(row) {
+        this.$router.push({
+          path: "/inspection/inspectionresult",
+          query: {
+            frameMode:"add",
+            id: row.id
+          },
+        });
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      handleAction() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("是否将选择巡检任务启动?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return Action(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      handleStop() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("是否将选择巡检任务停止?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return reject(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      handleExport() {
+        this.$confirm("是否导出数据?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          expUtil.excelExport(`/api/equipmentledger/export?daf-auth=${getToken()}`, this.search, ['station', 'userStatus']);
+        });
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getDetail(this.form.id).then(res => {
+            this.form = res.data.data;
+          });
+        }
+        done();
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      selectionClear() {
+        this.selectionList = [];
+        this.$refs.crud.toggleSelection();
+      },
+      currentChange(currentPage){
+        this.page.currentPage = currentPage;
+      },
+      sizeChange(pageSize){
+        this.page.pageSize = pageSize;
+      },
+      onLoad(page, params = {}) {
+        this.loading = true;
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      },
+      headerClass() {
+        return 'header-class'
+      }
+    }
+  };
+</script>
+
+<style>
+.header-class{
+  background-color: #3366cc !important;
+  color: #FFFFFF !important;
+}
+</style>
diff --git a/src/views/leger/dynamicledgerDetail.vue b/src/views/leger/dynamicledgerDetail.vue
index e485915..002c4f6 100644
--- a/src/views/leger/dynamicledgerDetail.vue
+++ b/src/views/leger/dynamicledgerDetail.vue
@@ -254,8 +254,8 @@ export default {
             prop: "operationStatus",
           },
           {
-            label: "操作任务",
-            prop: "operationTask",
+            label: "操作票类型",
+            prop: "operationType",
           },
           {
             label: "操作开始时间",