diff --git a/src/components/Engineering/MyHomework.vue b/src/components/Engineering/MyHomework.vue
new file mode 100644
index 0000000..63b3c62
--- /dev/null
+++ b/src/components/Engineering/MyHomework.vue
@@ -0,0 +1,47 @@
+<template>
+  <div id="MyHomework">
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="实时作业" name="first">
+        <child1 v-if="isChildUpdate1"></child1>
+      </el-tab-pane>
+      <el-tab-pane label="历史作业" name="second">
+        <child2 v-if="!isChildUpdate1"></child2>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import MyHomework_Now from "@/components/Engineering/MyHomework_Now"; //我的作业-实时作业
+import MyHomework_History from "@/components/Engineering/MyHomework_History"; //我的作业-历史作业
+export default {
+  name: "MyHomework",
+  components: {
+    child1: MyHomework_Now,
+    child2: MyHomework_History
+  },
+  data: function() {
+    return {
+      activeName: "first",
+      isChildUpdate1: true
+    };
+  },
+  methods: {
+    handleClick(tab, event) {
+      if (tab.name == "first") {
+        this.isChildUpdate1 = true;
+      } else if (tab.name == "second") {
+        this.isChildUpdate1 = false;
+      }
+    }
+  },
+  mounted: function() {}
+};
+</script>
+
+<style scoped>
+#MyHomework {
+  width: 100%;
+  height: 100%;
+}
+</style>
\ No newline at end of file

diff --git a/src/components/Engineering/MyHomework.vue b/src/components/Engineering/MyHomework.vue
new file mode 100644
index 0000000..63b3c62
--- /dev/null
+++ b/src/components/Engineering/MyHomework.vue
@@ -0,0 +1,47 @@
+<template>
+  <div id="MyHomework">
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="实时作业" name="first">
+        <child1 v-if="isChildUpdate1"></child1>
+      </el-tab-pane>
+      <el-tab-pane label="历史作业" name="second">
+        <child2 v-if="!isChildUpdate1"></child2>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import MyHomework_Now from "@/components/Engineering/MyHomework_Now"; //我的作业-实时作业
+import MyHomework_History from "@/components/Engineering/MyHomework_History"; //我的作业-历史作业
+export default {
+  name: "MyHomework",
+  components: {
+    child1: MyHomework_Now,
+    child2: MyHomework_History
+  },
+  data: function() {
+    return {
+      activeName: "first",
+      isChildUpdate1: true
+    };
+  },
+  methods: {
+    handleClick(tab, event) {
+      if (tab.name == "first") {
+        this.isChildUpdate1 = true;
+      } else if (tab.name == "second") {
+        this.isChildUpdate1 = false;
+      }
+    }
+  },
+  mounted: function() {}
+};
+</script>
+
+<style scoped>
+#MyHomework {
+  width: 100%;
+  height: 100%;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/Engineering/MyHomework_History.vue b/src/components/Engineering/MyHomework_History.vue
new file mode 100644
index 0000000..d7125be
--- /dev/null
+++ b/src/components/Engineering/MyHomework_History.vue
@@ -0,0 +1,175 @@
+<template>
+  <div id="MyHomework_History">
+    <div id="MH_HTopSearchBox">
+      <span class="SelectTitle">站点查询：</span>
+      <el-input v-model="condition" placeholder="请输入站点名称/编号"></el-input>
+      <span class="SelectTitle">时间选择：</span>
+      <el-date-picker
+        v-model="TimeValue"
+        type="datetimerange"
+        align="right"
+        unlink-panels
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+      ></el-date-picker>
+      <el-button type="primary" icon="el-icon-search" @click="loadDataGridData">搜索</el-button>
+    </div>
+    <div id="MH_HCertent">
+      <el-table
+        :data="HistoryTableData"
+        style="width: 100%;height:calc(100% - 45px)"
+        v-loading="loading"
+        element-loading-text="拼命加载中"
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+        stripe
+      >
+        <el-table-column prop="siteNo" label="站点编号"></el-table-column>
+        <el-table-column prop="siteName" label="站点名称"></el-table-column>
+        <el-table-column prop="taskUserNo" label="作业人账号"></el-table-column>
+        <el-table-column prop="taskUserName" label="作业人姓名"></el-table-column>
+        <el-table-column prop="beginTime" label="上报时间"></el-table-column>
+        <el-table-column prop="taskRemark" label="备注"></el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="SizeChange"
+        @current-change="CurrentChange"
+        :current-page="Page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="Size"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="DataLength"
+        style="margin-top:10px;"
+      ></el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import { message } from "./../../util/item";
+export default {
+  name: "MyHomework_History",
+  data: function() {
+    return {
+      condition: "",
+      HistoryTableData: [], //历史数据表格数据
+      Page: 1, //分页默认显示页
+      DataLength: 0, //分页上显示的数据总条数
+      Size: 10, //分页上显示的每页的条数
+      loading: false,
+      TimeValue: [
+        this.moment()
+          .subtract("days", 3)
+          .format("YYYY-MM-DD HH:mm:ss"),
+        this.moment().format("YYYY-MM-DD HH:mm:ss")
+      ], //时间
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            }
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            }
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            }
+          }
+        ]
+      } //时间快捷选项
+    };
+  },
+  methods: {
+    SizeChange(val) {
+      // 改变每页的条数
+      this.Size = val;
+      this.loadDataGridData();
+    },
+    CurrentChange(val) {
+      //改变页数
+      this.Page = val;
+      this.loadDataGridData();
+    },
+    loadDataGridData() {
+      this.loading = true;
+      this.$http
+        .post(this.nozzle.taskInfoGetHisInfo, {
+          condition: this.condition,
+          pageNo: this.Page,
+          pageSize: this.Size,
+          st: this.TimeValue[0],
+          et: this.TimeValue[1]
+        })
+        .then(response => {
+          this.loading = false;
+          this.HistoryTableData = response.data.data;
+          this.DataLength = response.data.total;
+        })
+        .catch(response => {
+          this.loading = false;
+          this.$message({
+            showClose: true,
+            message: "请求日志失败",
+            type: "warning"
+          });
+        });
+    }
+  },
+  mounted: function() {
+    this.loadDataGridData();
+  }
+};
+</script>
+
+<style scoped>
+#MyHomework_History {
+  width: 100%;
+  height: 100%;
+}
+/* 顶部搜索 */
+#MH_HTopSearchBox {
+  width: 100%;
+  height: 60px;
+  line-height: 60px;
+  text-align: left;
+  color: white;
+}
+#MH_HTopSearchBox .el-input {
+  width: 200px;
+  margin: 0 10px;
+}
+.SelectTitle {
+  display: inline-block;
+  margin-left: 5px;
+  text-align: center;
+  height: 60px;
+  line-height: 60px;
+}
+/* 主体内容 */
+#MH_HCertent {
+  width: 100%;
+  height: calc(100% - 70px);
+  margin-top: 10px;
+  background: rgba(53, 53, 53, 0.5);
+}
+</style>

diff --git a/src/components/Engineering/MyHomework.vue b/src/components/Engineering/MyHomework.vue
new file mode 100644
index 0000000..63b3c62
--- /dev/null
+++ b/src/components/Engineering/MyHomework.vue
@@ -0,0 +1,47 @@
+<template>
+  <div id="MyHomework">
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="实时作业" name="first">
+        <child1 v-if="isChildUpdate1"></child1>
+      </el-tab-pane>
+      <el-tab-pane label="历史作业" name="second">
+        <child2 v-if="!isChildUpdate1"></child2>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import MyHomework_Now from "@/components/Engineering/MyHomework_Now"; //我的作业-实时作业
+import MyHomework_History from "@/components/Engineering/MyHomework_History"; //我的作业-历史作业
+export default {
+  name: "MyHomework",
+  components: {
+    child1: MyHomework_Now,
+    child2: MyHomework_History
+  },
+  data: function() {
+    return {
+      activeName: "first",
+      isChildUpdate1: true
+    };
+  },
+  methods: {
+    handleClick(tab, event) {
+      if (tab.name == "first") {
+        this.isChildUpdate1 = true;
+      } else if (tab.name == "second") {
+        this.isChildUpdate1 = false;
+      }
+    }
+  },
+  mounted: function() {}
+};
+</script>
+
+<style scoped>
+#MyHomework {
+  width: 100%;
+  height: 100%;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/Engineering/MyHomework_History.vue b/src/components/Engineering/MyHomework_History.vue
new file mode 100644
index 0000000..d7125be
--- /dev/null
+++ b/src/components/Engineering/MyHomework_History.vue
@@ -0,0 +1,175 @@
+<template>
+  <div id="MyHomework_History">
+    <div id="MH_HTopSearchBox">
+      <span class="SelectTitle">站点查询：</span>
+      <el-input v-model="condition" placeholder="请输入站点名称/编号"></el-input>
+      <span class="SelectTitle">时间选择：</span>
+      <el-date-picker
+        v-model="TimeValue"
+        type="datetimerange"
+        align="right"
+        unlink-panels
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+      ></el-date-picker>
+      <el-button type="primary" icon="el-icon-search" @click="loadDataGridData">搜索</el-button>
+    </div>
+    <div id="MH_HCertent">
+      <el-table
+        :data="HistoryTableData"
+        style="width: 100%;height:calc(100% - 45px)"
+        v-loading="loading"
+        element-loading-text="拼命加载中"
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+        stripe
+      >
+        <el-table-column prop="siteNo" label="站点编号"></el-table-column>
+        <el-table-column prop="siteName" label="站点名称"></el-table-column>
+        <el-table-column prop="taskUserNo" label="作业人账号"></el-table-column>
+        <el-table-column prop="taskUserName" label="作业人姓名"></el-table-column>
+        <el-table-column prop="beginTime" label="上报时间"></el-table-column>
+        <el-table-column prop="taskRemark" label="备注"></el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="SizeChange"
+        @current-change="CurrentChange"
+        :current-page="Page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="Size"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="DataLength"
+        style="margin-top:10px;"
+      ></el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import { message } from "./../../util/item";
+export default {
+  name: "MyHomework_History",
+  data: function() {
+    return {
+      condition: "",
+      HistoryTableData: [], //历史数据表格数据
+      Page: 1, //分页默认显示页
+      DataLength: 0, //分页上显示的数据总条数
+      Size: 10, //分页上显示的每页的条数
+      loading: false,
+      TimeValue: [
+        this.moment()
+          .subtract("days", 3)
+          .format("YYYY-MM-DD HH:mm:ss"),
+        this.moment().format("YYYY-MM-DD HH:mm:ss")
+      ], //时间
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            }
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            }
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            }
+          }
+        ]
+      } //时间快捷选项
+    };
+  },
+  methods: {
+    SizeChange(val) {
+      // 改变每页的条数
+      this.Size = val;
+      this.loadDataGridData();
+    },
+    CurrentChange(val) {
+      //改变页数
+      this.Page = val;
+      this.loadDataGridData();
+    },
+    loadDataGridData() {
+      this.loading = true;
+      this.$http
+        .post(this.nozzle.taskInfoGetHisInfo, {
+          condition: this.condition,
+          pageNo: this.Page,
+          pageSize: this.Size,
+          st: this.TimeValue[0],
+          et: this.TimeValue[1]
+        })
+        .then(response => {
+          this.loading = false;
+          this.HistoryTableData = response.data.data;
+          this.DataLength = response.data.total;
+        })
+        .catch(response => {
+          this.loading = false;
+          this.$message({
+            showClose: true,
+            message: "请求日志失败",
+            type: "warning"
+          });
+        });
+    }
+  },
+  mounted: function() {
+    this.loadDataGridData();
+  }
+};
+</script>
+
+<style scoped>
+#MyHomework_History {
+  width: 100%;
+  height: 100%;
+}
+/* 顶部搜索 */
+#MH_HTopSearchBox {
+  width: 100%;
+  height: 60px;
+  line-height: 60px;
+  text-align: left;
+  color: white;
+}
+#MH_HTopSearchBox .el-input {
+  width: 200px;
+  margin: 0 10px;
+}
+.SelectTitle {
+  display: inline-block;
+  margin-left: 5px;
+  text-align: center;
+  height: 60px;
+  line-height: 60px;
+}
+/* 主体内容 */
+#MH_HCertent {
+  width: 100%;
+  height: calc(100% - 70px);
+  margin-top: 10px;
+  background: rgba(53, 53, 53, 0.5);
+}
+</style>
diff --git a/src/components/Engineering/MyHomework_Now.vue b/src/components/Engineering/MyHomework_Now.vue
new file mode 100644
index 0000000..cb51cf0
--- /dev/null
+++ b/src/components/Engineering/MyHomework_Now.vue
@@ -0,0 +1,157 @@
+<template>
+  <div id="MyHomework_Now">
+    <div id="MH_NTopSearchBox">
+      <span class="SelectTitle">站点查询：</span>
+      <el-input v-model="condition" placeholder="请输入站点名称/编号"></el-input>
+      <el-button type="primary" icon="el-icon-search" @click="loadDataGridData">搜索</el-button>
+      <!-- <img src="http://medical-cloud.fvzz.cn/newfiber/upload/file/190710014205427190989.190710014204374189345.jpg" alt=""> -->
+    </div>
+    <div id="MH_NCertent">
+      <el-table
+        :data="HistoryTableData"
+        style="width: 100%;height:calc(100% - 45px)"
+        v-loading="loading"
+        element-loading-text="拼命加载中"
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+        stripe
+      >
+        <el-table-column prop="siteNo" label="站点编号"></el-table-column>
+        <el-table-column prop="siteName" label="站点名称"></el-table-column>
+        <el-table-column prop="taskUserNo" label="作业人账号"></el-table-column>
+        <el-table-column prop="taskUserName" label="作业人姓名"></el-table-column>
+        <el-table-column prop="beginTime" label="上报时间"></el-table-column>
+        <el-table-column prop="taskRemark" label="备注"></el-table-column>
+        <el-table-column prop="pics" label="查看图片">
+          <template slot-scope="scope">
+            <img
+              v-for="item in scope.row.pics"
+              :src="item.pictureUrl"
+              alt
+              class="TableImg"
+              @click="YuLan(item.pictureUrl)"
+              title="点击查看图片"
+            />
+            <span v-if="scope.row.pics.length==0">无图片</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="SizeChange"
+        @current-change="CurrentChange"
+        :current-page="Page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="Size"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="DataLength"
+        style="margin-top:10px;"
+      ></el-pagination>
+    </div>
+    <el-dialog title="图片预览" :visible.sync="dialogVisible" width="40%">
+      <img :src="YuLanImgUrl" alt id="YuLanImg" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { message } from "./../../util/item";
+export default {
+  name: "MyHomework_Now",
+  data: function() {
+    return {
+      condition: "",
+      HistoryTableData: [], //历史数据表格数据
+      Page: 1, //分页默认显示页
+      DataLength: 0, //分页上显示的数据总条数
+      Size: 10, //分页上显示的每页的条数
+      loading: false,
+      dialogVisible: false
+    };
+  },
+  methods: {
+    SizeChange(val) {
+      // 改变每页的条数
+      this.Size = val;
+      this.loadDataGridData();
+    },
+    CurrentChange(val) {
+      //改变页数
+      this.Page = val;
+      this.loadDataGridData();
+    },
+    loadDataGridData() {
+      this.loading = true;
+      this.$http
+        .post(this.nozzle.taskInfoGetTempInfo, {
+          condition: this.condition,
+          pageNo: this.Page,
+          pageSize: this.Size
+        })
+        .then(response => {
+          this.loading = false;
+          this.HistoryTableData = response.data.data;
+          this.DataLength = response.data.total;
+        })
+        .catch(response => {
+          this.loading = false;
+          this.$message({
+            showClose: true,
+            message: "请求日志失败",
+            type: "warning"
+          });
+        });
+    },
+    YuLan(V) {
+      this.YuLanImgUrl = V;
+      this.dialogVisible = true;
+    }
+  },
+  mounted: function() {
+    this.loadDataGridData();
+  }
+};
+</script>
+
+<style scoped>
+#MyHomework_Now {
+  width: 100%;
+  height: 100%;
+}
+/* 顶部搜索 */
+#MH_NTopSearchBox {
+  width: 100%;
+  height: 60px;
+  line-height: 60px;
+  text-align: left;
+  color: white;
+}
+#MH_NTopSearchBox .el-input {
+  width: 200px;
+  margin: 0 10px;
+}
+.SelectTitle {
+  display: inline-block;
+  margin-left: 5px;
+  text-align: center;
+  height: 60px;
+  line-height: 60px;
+}
+/* 主体内容 */
+#MH_NCertent {
+  width: 100%;
+  height: calc(100% - 70px);
+  margin-top: 10px;
+  background: rgba(53, 53, 53, 0.5);
+}
+/* 表格内图片 */
+.TableImg {
+  width: 30px;
+  height: 30px;
+  cursor: pointer;
+}
+/* 预览图片 */
+#YuLanImg {
+  width: 100%;
+  height: auto;
+}
+</style>

diff --git a/src/components/Engineering/MyHomework.vue b/src/components/Engineering/MyHomework.vue
new file mode 100644
index 0000000..63b3c62
--- /dev/null
+++ b/src/components/Engineering/MyHomework.vue
@@ -0,0 +1,47 @@
+<template>
+  <div id="MyHomework">
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="实时作业" name="first">
+        <child1 v-if="isChildUpdate1"></child1>
+      </el-tab-pane>
+      <el-tab-pane label="历史作业" name="second">
+        <child2 v-if="!isChildUpdate1"></child2>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import MyHomework_Now from "@/components/Engineering/MyHomework_Now"; //我的作业-实时作业
+import MyHomework_History from "@/components/Engineering/MyHomework_History"; //我的作业-历史作业
+export default {
+  name: "MyHomework",
+  components: {
+    child1: MyHomework_Now,
+    child2: MyHomework_History
+  },
+  data: function() {
+    return {
+      activeName: "first",
+      isChildUpdate1: true
+    };
+  },
+  methods: {
+    handleClick(tab, event) {
+      if (tab.name == "first") {
+        this.isChildUpdate1 = true;
+      } else if (tab.name == "second") {
+        this.isChildUpdate1 = false;
+      }
+    }
+  },
+  mounted: function() {}
+};
+</script>
+
+<style scoped>
+#MyHomework {
+  width: 100%;
+  height: 100%;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/Engineering/MyHomework_History.vue b/src/components/Engineering/MyHomework_History.vue
new file mode 100644
index 0000000..d7125be
--- /dev/null
+++ b/src/components/Engineering/MyHomework_History.vue
@@ -0,0 +1,175 @@
+<template>
+  <div id="MyHomework_History">
+    <div id="MH_HTopSearchBox">
+      <span class="SelectTitle">站点查询：</span>
+      <el-input v-model="condition" placeholder="请输入站点名称/编号"></el-input>
+      <span class="SelectTitle">时间选择：</span>
+      <el-date-picker
+        v-model="TimeValue"
+        type="datetimerange"
+        align="right"
+        unlink-panels
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+      ></el-date-picker>
+      <el-button type="primary" icon="el-icon-search" @click="loadDataGridData">搜索</el-button>
+    </div>
+    <div id="MH_HCertent">
+      <el-table
+        :data="HistoryTableData"
+        style="width: 100%;height:calc(100% - 45px)"
+        v-loading="loading"
+        element-loading-text="拼命加载中"
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+        stripe
+      >
+        <el-table-column prop="siteNo" label="站点编号"></el-table-column>
+        <el-table-column prop="siteName" label="站点名称"></el-table-column>
+        <el-table-column prop="taskUserNo" label="作业人账号"></el-table-column>
+        <el-table-column prop="taskUserName" label="作业人姓名"></el-table-column>
+        <el-table-column prop="beginTime" label="上报时间"></el-table-column>
+        <el-table-column prop="taskRemark" label="备注"></el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="SizeChange"
+        @current-change="CurrentChange"
+        :current-page="Page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="Size"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="DataLength"
+        style="margin-top:10px;"
+      ></el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import { message } from "./../../util/item";
+export default {
+  name: "MyHomework_History",
+  data: function() {
+    return {
+      condition: "",
+      HistoryTableData: [], //历史数据表格数据
+      Page: 1, //分页默认显示页
+      DataLength: 0, //分页上显示的数据总条数
+      Size: 10, //分页上显示的每页的条数
+      loading: false,
+      TimeValue: [
+        this.moment()
+          .subtract("days", 3)
+          .format("YYYY-MM-DD HH:mm:ss"),
+        this.moment().format("YYYY-MM-DD HH:mm:ss")
+      ], //时间
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            }
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            }
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            }
+          }
+        ]
+      } //时间快捷选项
+    };
+  },
+  methods: {
+    SizeChange(val) {
+      // 改变每页的条数
+      this.Size = val;
+      this.loadDataGridData();
+    },
+    CurrentChange(val) {
+      //改变页数
+      this.Page = val;
+      this.loadDataGridData();
+    },
+    loadDataGridData() {
+      this.loading = true;
+      this.$http
+        .post(this.nozzle.taskInfoGetHisInfo, {
+          condition: this.condition,
+          pageNo: this.Page,
+          pageSize: this.Size,
+          st: this.TimeValue[0],
+          et: this.TimeValue[1]
+        })
+        .then(response => {
+          this.loading = false;
+          this.HistoryTableData = response.data.data;
+          this.DataLength = response.data.total;
+        })
+        .catch(response => {
+          this.loading = false;
+          this.$message({
+            showClose: true,
+            message: "请求日志失败",
+            type: "warning"
+          });
+        });
+    }
+  },
+  mounted: function() {
+    this.loadDataGridData();
+  }
+};
+</script>
+
+<style scoped>
+#MyHomework_History {
+  width: 100%;
+  height: 100%;
+}
+/* 顶部搜索 */
+#MH_HTopSearchBox {
+  width: 100%;
+  height: 60px;
+  line-height: 60px;
+  text-align: left;
+  color: white;
+}
+#MH_HTopSearchBox .el-input {
+  width: 200px;
+  margin: 0 10px;
+}
+.SelectTitle {
+  display: inline-block;
+  margin-left: 5px;
+  text-align: center;
+  height: 60px;
+  line-height: 60px;
+}
+/* 主体内容 */
+#MH_HCertent {
+  width: 100%;
+  height: calc(100% - 70px);
+  margin-top: 10px;
+  background: rgba(53, 53, 53, 0.5);
+}
+</style>
diff --git a/src/components/Engineering/MyHomework_Now.vue b/src/components/Engineering/MyHomework_Now.vue
new file mode 100644
index 0000000..cb51cf0
--- /dev/null
+++ b/src/components/Engineering/MyHomework_Now.vue
@@ -0,0 +1,157 @@
+<template>
+  <div id="MyHomework_Now">
+    <div id="MH_NTopSearchBox">
+      <span class="SelectTitle">站点查询：</span>
+      <el-input v-model="condition" placeholder="请输入站点名称/编号"></el-input>
+      <el-button type="primary" icon="el-icon-search" @click="loadDataGridData">搜索</el-button>
+      <!-- <img src="http://medical-cloud.fvzz.cn/newfiber/upload/file/190710014205427190989.190710014204374189345.jpg" alt=""> -->
+    </div>
+    <div id="MH_NCertent">
+      <el-table
+        :data="HistoryTableData"
+        style="width: 100%;height:calc(100% - 45px)"
+        v-loading="loading"
+        element-loading-text="拼命加载中"
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+        stripe
+      >
+        <el-table-column prop="siteNo" label="站点编号"></el-table-column>
+        <el-table-column prop="siteName" label="站点名称"></el-table-column>
+        <el-table-column prop="taskUserNo" label="作业人账号"></el-table-column>
+        <el-table-column prop="taskUserName" label="作业人姓名"></el-table-column>
+        <el-table-column prop="beginTime" label="上报时间"></el-table-column>
+        <el-table-column prop="taskRemark" label="备注"></el-table-column>
+        <el-table-column prop="pics" label="查看图片">
+          <template slot-scope="scope">
+            <img
+              v-for="item in scope.row.pics"
+              :src="item.pictureUrl"
+              alt
+              class="TableImg"
+              @click="YuLan(item.pictureUrl)"
+              title="点击查看图片"
+            />
+            <span v-if="scope.row.pics.length==0">无图片</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="SizeChange"
+        @current-change="CurrentChange"
+        :current-page="Page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="Size"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="DataLength"
+        style="margin-top:10px;"
+      ></el-pagination>
+    </div>
+    <el-dialog title="图片预览" :visible.sync="dialogVisible" width="40%">
+      <img :src="YuLanImgUrl" alt id="YuLanImg" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { message } from "./../../util/item";
+export default {
+  name: "MyHomework_Now",
+  data: function() {
+    return {
+      condition: "",
+      HistoryTableData: [], //历史数据表格数据
+      Page: 1, //分页默认显示页
+      DataLength: 0, //分页上显示的数据总条数
+      Size: 10, //分页上显示的每页的条数
+      loading: false,
+      dialogVisible: false
+    };
+  },
+  methods: {
+    SizeChange(val) {
+      // 改变每页的条数
+      this.Size = val;
+      this.loadDataGridData();
+    },
+    CurrentChange(val) {
+      //改变页数
+      this.Page = val;
+      this.loadDataGridData();
+    },
+    loadDataGridData() {
+      this.loading = true;
+      this.$http
+        .post(this.nozzle.taskInfoGetTempInfo, {
+          condition: this.condition,
+          pageNo: this.Page,
+          pageSize: this.Size
+        })
+        .then(response => {
+          this.loading = false;
+          this.HistoryTableData = response.data.data;
+          this.DataLength = response.data.total;
+        })
+        .catch(response => {
+          this.loading = false;
+          this.$message({
+            showClose: true,
+            message: "请求日志失败",
+            type: "warning"
+          });
+        });
+    },
+    YuLan(V) {
+      this.YuLanImgUrl = V;
+      this.dialogVisible = true;
+    }
+  },
+  mounted: function() {
+    this.loadDataGridData();
+  }
+};
+</script>
+
+<style scoped>
+#MyHomework_Now {
+  width: 100%;
+  height: 100%;
+}
+/* 顶部搜索 */
+#MH_NTopSearchBox {
+  width: 100%;
+  height: 60px;
+  line-height: 60px;
+  text-align: left;
+  color: white;
+}
+#MH_NTopSearchBox .el-input {
+  width: 200px;
+  margin: 0 10px;
+}
+.SelectTitle {
+  display: inline-block;
+  margin-left: 5px;
+  text-align: center;
+  height: 60px;
+  line-height: 60px;
+}
+/* 主体内容 */
+#MH_NCertent {
+  width: 100%;
+  height: calc(100% - 70px);
+  margin-top: 10px;
+  background: rgba(53, 53, 53, 0.5);
+}
+/* 表格内图片 */
+.TableImg {
+  width: 30px;
+  height: 30px;
+  cursor: pointer;
+}
+/* 预览图片 */
+#YuLanImg {
+  width: 100%;
+  height: auto;
+}
+</style>
diff --git a/src/components/Engineering/Nowfault.vue b/src/components/Engineering/Nowfault.vue
index 51f1492..8eb6c29 100644
--- a/src/components/Engineering/Nowfault.vue
+++ b/src/components/Engineering/Nowfault.vue
@@ -34,7 +34,7 @@
     </div>
   </div>
 </template>
-
+ 
 <script>
 export default {
   name: "Nowfault",

diff --git a/src/components/Engineering/MyHomework.vue b/src/components/Engineering/MyHomework.vue
new file mode 100644
index 0000000..63b3c62
--- /dev/null
+++ b/src/components/Engineering/MyHomework.vue
@@ -0,0 +1,47 @@
+<template>
+  <div id="MyHomework">
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="实时作业" name="first">
+        <child1 v-if="isChildUpdate1"></child1>
+      </el-tab-pane>
+      <el-tab-pane label="历史作业" name="second">
+        <child2 v-if="!isChildUpdate1"></child2>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import MyHomework_Now from "@/components/Engineering/MyHomework_Now"; //我的作业-实时作业
+import MyHomework_History from "@/components/Engineering/MyHomework_History"; //我的作业-历史作业
+export default {
+  name: "MyHomework",
+  components: {
+    child1: MyHomework_Now,
+    child2: MyHomework_History
+  },
+  data: function() {
+    return {
+      activeName: "first",
+      isChildUpdate1: true
+    };
+  },
+  methods: {
+    handleClick(tab, event) {
+      if (tab.name == "first") {
+        this.isChildUpdate1 = true;
+      } else if (tab.name == "second") {
+        this.isChildUpdate1 = false;
+      }
+    }
+  },
+  mounted: function() {}
+};
+</script>
+
+<style scoped>
+#MyHomework {
+  width: 100%;
+  height: 100%;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/Engineering/MyHomework_History.vue b/src/components/Engineering/MyHomework_History.vue
new file mode 100644
index 0000000..d7125be
--- /dev/null
+++ b/src/components/Engineering/MyHomework_History.vue
@@ -0,0 +1,175 @@
+<template>
+  <div id="MyHomework_History">
+    <div id="MH_HTopSearchBox">
+      <span class="SelectTitle">站点查询：</span>
+      <el-input v-model="condition" placeholder="请输入站点名称/编号"></el-input>
+      <span class="SelectTitle">时间选择：</span>
+      <el-date-picker
+        v-model="TimeValue"
+        type="datetimerange"
+        align="right"
+        unlink-panels
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+      ></el-date-picker>
+      <el-button type="primary" icon="el-icon-search" @click="loadDataGridData">搜索</el-button>
+    </div>
+    <div id="MH_HCertent">
+      <el-table
+        :data="HistoryTableData"
+        style="width: 100%;height:calc(100% - 45px)"
+        v-loading="loading"
+        element-loading-text="拼命加载中"
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+        stripe
+      >
+        <el-table-column prop="siteNo" label="站点编号"></el-table-column>
+        <el-table-column prop="siteName" label="站点名称"></el-table-column>
+        <el-table-column prop="taskUserNo" label="作业人账号"></el-table-column>
+        <el-table-column prop="taskUserName" label="作业人姓名"></el-table-column>
+        <el-table-column prop="beginTime" label="上报时间"></el-table-column>
+        <el-table-column prop="taskRemark" label="备注"></el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="SizeChange"
+        @current-change="CurrentChange"
+        :current-page="Page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="Size"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="DataLength"
+        style="margin-top:10px;"
+      ></el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import { message } from "./../../util/item";
+export default {
+  name: "MyHomework_History",
+  data: function() {
+    return {
+      condition: "",
+      HistoryTableData: [], //历史数据表格数据
+      Page: 1, //分页默认显示页
+      DataLength: 0, //分页上显示的数据总条数
+      Size: 10, //分页上显示的每页的条数
+      loading: false,
+      TimeValue: [
+        this.moment()
+          .subtract("days", 3)
+          .format("YYYY-MM-DD HH:mm:ss"),
+        this.moment().format("YYYY-MM-DD HH:mm:ss")
+      ], //时间
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            }
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            }
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            }
+          }
+        ]
+      } //时间快捷选项
+    };
+  },
+  methods: {
+    SizeChange(val) {
+      // 改变每页的条数
+      this.Size = val;
+      this.loadDataGridData();
+    },
+    CurrentChange(val) {
+      //改变页数
+      this.Page = val;
+      this.loadDataGridData();
+    },
+    loadDataGridData() {
+      this.loading = true;
+      this.$http
+        .post(this.nozzle.taskInfoGetHisInfo, {
+          condition: this.condition,
+          pageNo: this.Page,
+          pageSize: this.Size,
+          st: this.TimeValue[0],
+          et: this.TimeValue[1]
+        })
+        .then(response => {
+          this.loading = false;
+          this.HistoryTableData = response.data.data;
+          this.DataLength = response.data.total;
+        })
+        .catch(response => {
+          this.loading = false;
+          this.$message({
+            showClose: true,
+            message: "请求日志失败",
+            type: "warning"
+          });
+        });
+    }
+  },
+  mounted: function() {
+    this.loadDataGridData();
+  }
+};
+</script>
+
+<style scoped>
+#MyHomework_History {
+  width: 100%;
+  height: 100%;
+}
+/* 顶部搜索 */
+#MH_HTopSearchBox {
+  width: 100%;
+  height: 60px;
+  line-height: 60px;
+  text-align: left;
+  color: white;
+}
+#MH_HTopSearchBox .el-input {
+  width: 200px;
+  margin: 0 10px;
+}
+.SelectTitle {
+  display: inline-block;
+  margin-left: 5px;
+  text-align: center;
+  height: 60px;
+  line-height: 60px;
+}
+/* 主体内容 */
+#MH_HCertent {
+  width: 100%;
+  height: calc(100% - 70px);
+  margin-top: 10px;
+  background: rgba(53, 53, 53, 0.5);
+}
+</style>
diff --git a/src/components/Engineering/MyHomework_Now.vue b/src/components/Engineering/MyHomework_Now.vue
new file mode 100644
index 0000000..cb51cf0
--- /dev/null
+++ b/src/components/Engineering/MyHomework_Now.vue
@@ -0,0 +1,157 @@
+<template>
+  <div id="MyHomework_Now">
+    <div id="MH_NTopSearchBox">
+      <span class="SelectTitle">站点查询：</span>
+      <el-input v-model="condition" placeholder="请输入站点名称/编号"></el-input>
+      <el-button type="primary" icon="el-icon-search" @click="loadDataGridData">搜索</el-button>
+      <!-- <img src="http://medical-cloud.fvzz.cn/newfiber/upload/file/190710014205427190989.190710014204374189345.jpg" alt=""> -->
+    </div>
+    <div id="MH_NCertent">
+      <el-table
+        :data="HistoryTableData"
+        style="width: 100%;height:calc(100% - 45px)"
+        v-loading="loading"
+        element-loading-text="拼命加载中"
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+        stripe
+      >
+        <el-table-column prop="siteNo" label="站点编号"></el-table-column>
+        <el-table-column prop="siteName" label="站点名称"></el-table-column>
+        <el-table-column prop="taskUserNo" label="作业人账号"></el-table-column>
+        <el-table-column prop="taskUserName" label="作业人姓名"></el-table-column>
+        <el-table-column prop="beginTime" label="上报时间"></el-table-column>
+        <el-table-column prop="taskRemark" label="备注"></el-table-column>
+        <el-table-column prop="pics" label="查看图片">
+          <template slot-scope="scope">
+            <img
+              v-for="item in scope.row.pics"
+              :src="item.pictureUrl"
+              alt
+              class="TableImg"
+              @click="YuLan(item.pictureUrl)"
+              title="点击查看图片"
+            />
+            <span v-if="scope.row.pics.length==0">无图片</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="SizeChange"
+        @current-change="CurrentChange"
+        :current-page="Page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="Size"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="DataLength"
+        style="margin-top:10px;"
+      ></el-pagination>
+    </div>
+    <el-dialog title="图片预览" :visible.sync="dialogVisible" width="40%">
+      <img :src="YuLanImgUrl" alt id="YuLanImg" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { message } from "./../../util/item";
+export default {
+  name: "MyHomework_Now",
+  data: function() {
+    return {
+      condition: "",
+      HistoryTableData: [], //历史数据表格数据
+      Page: 1, //分页默认显示页
+      DataLength: 0, //分页上显示的数据总条数
+      Size: 10, //分页上显示的每页的条数
+      loading: false,
+      dialogVisible: false
+    };
+  },
+  methods: {
+    SizeChange(val) {
+      // 改变每页的条数
+      this.Size = val;
+      this.loadDataGridData();
+    },
+    CurrentChange(val) {
+      //改变页数
+      this.Page = val;
+      this.loadDataGridData();
+    },
+    loadDataGridData() {
+      this.loading = true;
+      this.$http
+        .post(this.nozzle.taskInfoGetTempInfo, {
+          condition: this.condition,
+          pageNo: this.Page,
+          pageSize: this.Size
+        })
+        .then(response => {
+          this.loading = false;
+          this.HistoryTableData = response.data.data;
+          this.DataLength = response.data.total;
+        })
+        .catch(response => {
+          this.loading = false;
+          this.$message({
+            showClose: true,
+            message: "请求日志失败",
+            type: "warning"
+          });
+        });
+    },
+    YuLan(V) {
+      this.YuLanImgUrl = V;
+      this.dialogVisible = true;
+    }
+  },
+  mounted: function() {
+    this.loadDataGridData();
+  }
+};
+</script>
+
+<style scoped>
+#MyHomework_Now {
+  width: 100%;
+  height: 100%;
+}
+/* 顶部搜索 */
+#MH_NTopSearchBox {
+  width: 100%;
+  height: 60px;
+  line-height: 60px;
+  text-align: left;
+  color: white;
+}
+#MH_NTopSearchBox .el-input {
+  width: 200px;
+  margin: 0 10px;
+}
+.SelectTitle {
+  display: inline-block;
+  margin-left: 5px;
+  text-align: center;
+  height: 60px;
+  line-height: 60px;
+}
+/* 主体内容 */
+#MH_NCertent {
+  width: 100%;
+  height: calc(100% - 70px);
+  margin-top: 10px;
+  background: rgba(53, 53, 53, 0.5);
+}
+/* 表格内图片 */
+.TableImg {
+  width: 30px;
+  height: 30px;
+  cursor: pointer;
+}
+/* 预览图片 */
+#YuLanImg {
+  width: 100%;
+  height: auto;
+}
+</style>
diff --git a/src/components/Engineering/Nowfault.vue b/src/components/Engineering/Nowfault.vue
index 51f1492..8eb6c29 100644
--- a/src/components/Engineering/Nowfault.vue
+++ b/src/components/Engineering/Nowfault.vue
@@ -34,7 +34,7 @@
     </div>
   </div>
 </template>
-
+ 
 <script>
 export default {
   name: "Nowfault",
diff --git a/src/components/configure/PatrolConfiguration.vue b/src/components/configure/PatrolConfiguration.vue
new file mode 100644
index 0000000..bdff98e
--- /dev/null
+++ b/src/components/configure/PatrolConfiguration.vue
@@ -0,0 +1,97 @@
+<template>
+  <div id="PatrolConfiguration">
+    <div id="PCTopSearchBox">
+      <span class="SelectTitle">平台：</span>
+      <el-select v-model="Project" filterable placeholder="请选择" @change="loadProjectUser(Project)">
+        <el-option
+          v-for="item in ProjectOptions"
+          :key="item.platform_code"
+          :label="item.name"
+          :value="item.platform_code"
+        ></el-option>
+      </el-select>
+    </div>
+    <div id="PCCertent"></div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "PatrolConfiguration",
+  data: function() {
+    return {
+      Project: "", //平台
+      ProjectOptions: [
+        {
+          name: "全部",
+          platform_code: ""
+        }
+      ] //平台的数据源
+    };
+  },
+  methods: {
+    // 获取所有平台
+    loadAllProject() {
+      this.$http
+        .get(this.nozzle.StationBaseControllerQueryPlatform)
+        .then(response => {
+          if (response.data.result.list.length > 0) {
+            this.ProjectOptions = this.ProjectOptions.concat(
+              response.data.result.list
+            );
+            this.Project = this.ProjectOptions[0].platform_code;
+          } else {
+            this.$message({
+              showClose: true,
+              message: "无项目",
+              type: "warning"
+            });
+          }
+        })
+        .catch(response => {
+          this.$message({
+            showClose: true,
+            message: "请求平台失败",
+            type: "warning"
+          });
+        });
+    }
+  },
+  mounted: function() {
+      this.loadAllProject()
+  }
+};
+</script>
+
+<style scoped>
+#PatrolConfiguration {
+  width: 100%;
+  height: 100%;
+}
+/* 顶部搜索 */
+#PCTopSearchBox {
+  width: 100%;
+  height: 60px;
+  line-height: 60px;
+  text-align: left;
+  color: white;
+}
+#PCTopSearchBox .el-input {
+  width: 200px;
+  margin: 0 10px;
+}
+.SelectTitle {
+  display: inline-block;
+  margin-left: 5px;
+  text-align: center;
+  height: 60px;
+  line-height: 60px;
+}
+/* 主体内容 */
+#PCCertent {
+  width: 100%;
+  height: calc(100% - 70px);
+  margin-top: 10px;
+  background: rgba(53, 53, 53, 0.5);
+}
+</style>
\ No newline at end of file

diff --git a/src/components/Engineering/MyHomework.vue b/src/components/Engineering/MyHomework.vue
new file mode 100644
index 0000000..63b3c62
--- /dev/null
+++ b/src/components/Engineering/MyHomework.vue
@@ -0,0 +1,47 @@
+<template>
+  <div id="MyHomework">
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="实时作业" name="first">
+        <child1 v-if="isChildUpdate1"></child1>
+      </el-tab-pane>
+      <el-tab-pane label="历史作业" name="second">
+        <child2 v-if="!isChildUpdate1"></child2>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import MyHomework_Now from "@/components/Engineering/MyHomework_Now"; //我的作业-实时作业
+import MyHomework_History from "@/components/Engineering/MyHomework_History"; //我的作业-历史作业
+export default {
+  name: "MyHomework",
+  components: {
+    child1: MyHomework_Now,
+    child2: MyHomework_History
+  },
+  data: function() {
+    return {
+      activeName: "first",
+      isChildUpdate1: true
+    };
+  },
+  methods: {
+    handleClick(tab, event) {
+      if (tab.name == "first") {
+        this.isChildUpdate1 = true;
+      } else if (tab.name == "second") {
+        this.isChildUpdate1 = false;
+      }
+    }
+  },
+  mounted: function() {}
+};
+</script>
+
+<style scoped>
+#MyHomework {
+  width: 100%;
+  height: 100%;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/Engineering/MyHomework_History.vue b/src/components/Engineering/MyHomework_History.vue
new file mode 100644
index 0000000..d7125be
--- /dev/null
+++ b/src/components/Engineering/MyHomework_History.vue
@@ -0,0 +1,175 @@
+<template>
+  <div id="MyHomework_History">
+    <div id="MH_HTopSearchBox">
+      <span class="SelectTitle">站点查询：</span>
+      <el-input v-model="condition" placeholder="请输入站点名称/编号"></el-input>
+      <span class="SelectTitle">时间选择：</span>
+      <el-date-picker
+        v-model="TimeValue"
+        type="datetimerange"
+        align="right"
+        unlink-panels
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+      ></el-date-picker>
+      <el-button type="primary" icon="el-icon-search" @click="loadDataGridData">搜索</el-button>
+    </div>
+    <div id="MH_HCertent">
+      <el-table
+        :data="HistoryTableData"
+        style="width: 100%;height:calc(100% - 45px)"
+        v-loading="loading"
+        element-loading-text="拼命加载中"
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+        stripe
+      >
+        <el-table-column prop="siteNo" label="站点编号"></el-table-column>
+        <el-table-column prop="siteName" label="站点名称"></el-table-column>
+        <el-table-column prop="taskUserNo" label="作业人账号"></el-table-column>
+        <el-table-column prop="taskUserName" label="作业人姓名"></el-table-column>
+        <el-table-column prop="beginTime" label="上报时间"></el-table-column>
+        <el-table-column prop="taskRemark" label="备注"></el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="SizeChange"
+        @current-change="CurrentChange"
+        :current-page="Page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="Size"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="DataLength"
+        style="margin-top:10px;"
+      ></el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import { message } from "./../../util/item";
+export default {
+  name: "MyHomework_History",
+  data: function() {
+    return {
+      condition: "",
+      HistoryTableData: [], //历史数据表格数据
+      Page: 1, //分页默认显示页
+      DataLength: 0, //分页上显示的数据总条数
+      Size: 10, //分页上显示的每页的条数
+      loading: false,
+      TimeValue: [
+        this.moment()
+          .subtract("days", 3)
+          .format("YYYY-MM-DD HH:mm:ss"),
+        this.moment().format("YYYY-MM-DD HH:mm:ss")
+      ], //时间
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            }
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            }
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            }
+          }
+        ]
+      } //时间快捷选项
+    };
+  },
+  methods: {
+    SizeChange(val) {
+      // 改变每页的条数
+      this.Size = val;
+      this.loadDataGridData();
+    },
+    CurrentChange(val) {
+      //改变页数
+      this.Page = val;
+      this.loadDataGridData();
+    },
+    loadDataGridData() {
+      this.loading = true;
+      this.$http
+        .post(this.nozzle.taskInfoGetHisInfo, {
+          condition: this.condition,
+          pageNo: this.Page,
+          pageSize: this.Size,
+          st: this.TimeValue[0],
+          et: this.TimeValue[1]
+        })
+        .then(response => {
+          this.loading = false;
+          this.HistoryTableData = response.data.data;
+          this.DataLength = response.data.total;
+        })
+        .catch(response => {
+          this.loading = false;
+          this.$message({
+            showClose: true,
+            message: "请求日志失败",
+            type: "warning"
+          });
+        });
+    }
+  },
+  mounted: function() {
+    this.loadDataGridData();
+  }
+};
+</script>
+
+<style scoped>
+#MyHomework_History {
+  width: 100%;
+  height: 100%;
+}
+/* 顶部搜索 */
+#MH_HTopSearchBox {
+  width: 100%;
+  height: 60px;
+  line-height: 60px;
+  text-align: left;
+  color: white;
+}
+#MH_HTopSearchBox .el-input {
+  width: 200px;
+  margin: 0 10px;
+}
+.SelectTitle {
+  display: inline-block;
+  margin-left: 5px;
+  text-align: center;
+  height: 60px;
+  line-height: 60px;
+}
+/* 主体内容 */
+#MH_HCertent {
+  width: 100%;
+  height: calc(100% - 70px);
+  margin-top: 10px;
+  background: rgba(53, 53, 53, 0.5);
+}
+</style>
diff --git a/src/components/Engineering/MyHomework_Now.vue b/src/components/Engineering/MyHomework_Now.vue
new file mode 100644
index 0000000..cb51cf0
--- /dev/null
+++ b/src/components/Engineering/MyHomework_Now.vue
@@ -0,0 +1,157 @@
+<template>
+  <div id="MyHomework_Now">
+    <div id="MH_NTopSearchBox">
+      <span class="SelectTitle">站点查询：</span>
+      <el-input v-model="condition" placeholder="请输入站点名称/编号"></el-input>
+      <el-button type="primary" icon="el-icon-search" @click="loadDataGridData">搜索</el-button>
+      <!-- <img src="http://medical-cloud.fvzz.cn/newfiber/upload/file/190710014205427190989.190710014204374189345.jpg" alt=""> -->
+    </div>
+    <div id="MH_NCertent">
+      <el-table
+        :data="HistoryTableData"
+        style="width: 100%;height:calc(100% - 45px)"
+        v-loading="loading"
+        element-loading-text="拼命加载中"
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+        stripe
+      >
+        <el-table-column prop="siteNo" label="站点编号"></el-table-column>
+        <el-table-column prop="siteName" label="站点名称"></el-table-column>
+        <el-table-column prop="taskUserNo" label="作业人账号"></el-table-column>
+        <el-table-column prop="taskUserName" label="作业人姓名"></el-table-column>
+        <el-table-column prop="beginTime" label="上报时间"></el-table-column>
+        <el-table-column prop="taskRemark" label="备注"></el-table-column>
+        <el-table-column prop="pics" label="查看图片">
+          <template slot-scope="scope">
+            <img
+              v-for="item in scope.row.pics"
+              :src="item.pictureUrl"
+              alt
+              class="TableImg"
+              @click="YuLan(item.pictureUrl)"
+              title="点击查看图片"
+            />
+            <span v-if="scope.row.pics.length==0">无图片</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="SizeChange"
+        @current-change="CurrentChange"
+        :current-page="Page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="Size"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="DataLength"
+        style="margin-top:10px;"
+      ></el-pagination>
+    </div>
+    <el-dialog title="图片预览" :visible.sync="dialogVisible" width="40%">
+      <img :src="YuLanImgUrl" alt id="YuLanImg" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { message } from "./../../util/item";
+export default {
+  name: "MyHomework_Now",
+  data: function() {
+    return {
+      condition: "",
+      HistoryTableData: [], //历史数据表格数据
+      Page: 1, //分页默认显示页
+      DataLength: 0, //分页上显示的数据总条数
+      Size: 10, //分页上显示的每页的条数
+      loading: false,
+      dialogVisible: false
+    };
+  },
+  methods: {
+    SizeChange(val) {
+      // 改变每页的条数
+      this.Size = val;
+      this.loadDataGridData();
+    },
+    CurrentChange(val) {
+      //改变页数
+      this.Page = val;
+      this.loadDataGridData();
+    },
+    loadDataGridData() {
+      this.loading = true;
+      this.$http
+        .post(this.nozzle.taskInfoGetTempInfo, {
+          condition: this.condition,
+          pageNo: this.Page,
+          pageSize: this.Size
+        })
+        .then(response => {
+          this.loading = false;
+          this.HistoryTableData = response.data.data;
+          this.DataLength = response.data.total;
+        })
+        .catch(response => {
+          this.loading = false;
+          this.$message({
+            showClose: true,
+            message: "请求日志失败",
+            type: "warning"
+          });
+        });
+    },
+    YuLan(V) {
+      this.YuLanImgUrl = V;
+      this.dialogVisible = true;
+    }
+  },
+  mounted: function() {
+    this.loadDataGridData();
+  }
+};
+</script>
+
+<style scoped>
+#MyHomework_Now {
+  width: 100%;
+  height: 100%;
+}
+/* 顶部搜索 */
+#MH_NTopSearchBox {
+  width: 100%;
+  height: 60px;
+  line-height: 60px;
+  text-align: left;
+  color: white;
+}
+#MH_NTopSearchBox .el-input {
+  width: 200px;
+  margin: 0 10px;
+}
+.SelectTitle {
+  display: inline-block;
+  margin-left: 5px;
+  text-align: center;
+  height: 60px;
+  line-height: 60px;
+}
+/* 主体内容 */
+#MH_NCertent {
+  width: 100%;
+  height: calc(100% - 70px);
+  margin-top: 10px;
+  background: rgba(53, 53, 53, 0.5);
+}
+/* 表格内图片 */
+.TableImg {
+  width: 30px;
+  height: 30px;
+  cursor: pointer;
+}
+/* 预览图片 */
+#YuLanImg {
+  width: 100%;
+  height: auto;
+}
+</style>
diff --git a/src/components/Engineering/Nowfault.vue b/src/components/Engineering/Nowfault.vue
index 51f1492..8eb6c29 100644
--- a/src/components/Engineering/Nowfault.vue
+++ b/src/components/Engineering/Nowfault.vue
@@ -34,7 +34,7 @@
     </div>
   </div>
 </template>
-
+ 
 <script>
 export default {
   name: "Nowfault",
diff --git a/src/components/configure/PatrolConfiguration.vue b/src/components/configure/PatrolConfiguration.vue
new file mode 100644
index 0000000..bdff98e
--- /dev/null
+++ b/src/components/configure/PatrolConfiguration.vue
@@ -0,0 +1,97 @@
+<template>
+  <div id="PatrolConfiguration">
+    <div id="PCTopSearchBox">
+      <span class="SelectTitle">平台：</span>
+      <el-select v-model="Project" filterable placeholder="请选择" @change="loadProjectUser(Project)">
+        <el-option
+          v-for="item in ProjectOptions"
+          :key="item.platform_code"
+          :label="item.name"
+          :value="item.platform_code"
+        ></el-option>
+      </el-select>
+    </div>
+    <div id="PCCertent"></div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "PatrolConfiguration",
+  data: function() {
+    return {
+      Project: "", //平台
+      ProjectOptions: [
+        {
+          name: "全部",
+          platform_code: ""
+        }
+      ] //平台的数据源
+    };
+  },
+  methods: {
+    // 获取所有平台
+    loadAllProject() {
+      this.$http
+        .get(this.nozzle.StationBaseControllerQueryPlatform)
+        .then(response => {
+          if (response.data.result.list.length > 0) {
+            this.ProjectOptions = this.ProjectOptions.concat(
+              response.data.result.list
+            );
+            this.Project = this.ProjectOptions[0].platform_code;
+          } else {
+            this.$message({
+              showClose: true,
+              message: "无项目",
+              type: "warning"
+            });
+          }
+        })
+        .catch(response => {
+          this.$message({
+            showClose: true,
+            message: "请求平台失败",
+            type: "warning"
+          });
+        });
+    }
+  },
+  mounted: function() {
+      this.loadAllProject()
+  }
+};
+</script>
+
+<style scoped>
+#PatrolConfiguration {
+  width: 100%;
+  height: 100%;
+}
+/* 顶部搜索 */
+#PCTopSearchBox {
+  width: 100%;
+  height: 60px;
+  line-height: 60px;
+  text-align: left;
+  color: white;
+}
+#PCTopSearchBox .el-input {
+  width: 200px;
+  margin: 0 10px;
+}
+.SelectTitle {
+  display: inline-block;
+  margin-left: 5px;
+  text-align: center;
+  height: 60px;
+  line-height: 60px;
+}
+/* 主体内容 */
+#PCCertent {
+  width: 100%;
+  height: calc(100% - 70px);
+  margin-top: 10px;
+  background: rgba(53, 53, 53, 0.5);
+}
+</style>
\ No newline at end of file
diff --git a/src/components/index.vue b/src/components/index.vue
index d8b1be8..249e547 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="IndexTop">
-    <el-container>
+    <el-container style="height:100%">
       <el-header height="40px">
         <img
           src="../../static/img/indexTop1.png"
@@ -39,7 +39,7 @@
           </el-dropdown-menu>
         </el-dropdown>
       </el-header>
-      <el-container>
+      <el-container style="height: calc(100% - 40px);">
         <el-aside :style="'width:' + MenuWidth + 'px'">
           <el-menu
             default-active="2-1"
@@ -73,6 +73,7 @@
               <el-menu-item index="4-1" route="/configure/AlarmConfiguration">报警配置</el-menu-item>
               <el-menu-item index="4-2" route="/configure/PushRules">推送规则</el-menu-item>
               <el-menu-item index="4-3" route="/configure/AlarmLog">报警日志</el-menu-item>
+              <el-menu-item index="4-4" route="/configure/PatrolConfiguration">巡检配置</el-menu-item>
             </el-submenu>
             <el-submenu index="5">
               <template slot="title">
@@ -105,6 +106,7 @@
               </template>
               <el-menu-item index="8-1" route="/Engineering/Nowfault">站点实时故障数据</el-menu-item>
               <el-menu-item index="8-2" route="/Engineering/HistoricalFault">站点历史故障数据</el-menu-item>
+              <el-menu-item index="8-3" route="/Engineering/MyHomework">我的作业</el-menu-item>
             </el-submenu>
           </el-menu>
         </el-aside>
@@ -239,6 +241,7 @@
   -ms-user-select: none; /*IE10+*/
   -khtml-user-select: none; /*早期的浏览器*/
   user-select: none;
+  /* overflow: auto; */
 }
 #ContentView {
   width: 100%;
@@ -330,7 +333,6 @@
 }
 .el-container {
   width: 100%;
-  height: 100%;
 }
 </style>
 

diff --git a/src/components/Engineering/MyHomework.vue b/src/components/Engineering/MyHomework.vue
new file mode 100644
index 0000000..63b3c62
--- /dev/null
+++ b/src/components/Engineering/MyHomework.vue
@@ -0,0 +1,47 @@
+<template>
+  <div id="MyHomework">
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="实时作业" name="first">
+        <child1 v-if="isChildUpdate1"></child1>
+      </el-tab-pane>
+      <el-tab-pane label="历史作业" name="second">
+        <child2 v-if="!isChildUpdate1"></child2>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import MyHomework_Now from "@/components/Engineering/MyHomework_Now"; //我的作业-实时作业
+import MyHomework_History from "@/components/Engineering/MyHomework_History"; //我的作业-历史作业
+export default {
+  name: "MyHomework",
+  components: {
+    child1: MyHomework_Now,
+    child2: MyHomework_History
+  },
+  data: function() {
+    return {
+      activeName: "first",
+      isChildUpdate1: true
+    };
+  },
+  methods: {
+    handleClick(tab, event) {
+      if (tab.name == "first") {
+        this.isChildUpdate1 = true;
+      } else if (tab.name == "second") {
+        this.isChildUpdate1 = false;
+      }
+    }
+  },
+  mounted: function() {}
+};
+</script>
+
+<style scoped>
+#MyHomework {
+  width: 100%;
+  height: 100%;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/Engineering/MyHomework_History.vue b/src/components/Engineering/MyHomework_History.vue
new file mode 100644
index 0000000..d7125be
--- /dev/null
+++ b/src/components/Engineering/MyHomework_History.vue
@@ -0,0 +1,175 @@
+<template>
+  <div id="MyHomework_History">
+    <div id="MH_HTopSearchBox">
+      <span class="SelectTitle">站点查询：</span>
+      <el-input v-model="condition" placeholder="请输入站点名称/编号"></el-input>
+      <span class="SelectTitle">时间选择：</span>
+      <el-date-picker
+        v-model="TimeValue"
+        type="datetimerange"
+        align="right"
+        unlink-panels
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+      ></el-date-picker>
+      <el-button type="primary" icon="el-icon-search" @click="loadDataGridData">搜索</el-button>
+    </div>
+    <div id="MH_HCertent">
+      <el-table
+        :data="HistoryTableData"
+        style="width: 100%;height:calc(100% - 45px)"
+        v-loading="loading"
+        element-loading-text="拼命加载中"
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+        stripe
+      >
+        <el-table-column prop="siteNo" label="站点编号"></el-table-column>
+        <el-table-column prop="siteName" label="站点名称"></el-table-column>
+        <el-table-column prop="taskUserNo" label="作业人账号"></el-table-column>
+        <el-table-column prop="taskUserName" label="作业人姓名"></el-table-column>
+        <el-table-column prop="beginTime" label="上报时间"></el-table-column>
+        <el-table-column prop="taskRemark" label="备注"></el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="SizeChange"
+        @current-change="CurrentChange"
+        :current-page="Page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="Size"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="DataLength"
+        style="margin-top:10px;"
+      ></el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import { message } from "./../../util/item";
+export default {
+  name: "MyHomework_History",
+  data: function() {
+    return {
+      condition: "",
+      HistoryTableData: [], //历史数据表格数据
+      Page: 1, //分页默认显示页
+      DataLength: 0, //分页上显示的数据总条数
+      Size: 10, //分页上显示的每页的条数
+      loading: false,
+      TimeValue: [
+        this.moment()
+          .subtract("days", 3)
+          .format("YYYY-MM-DD HH:mm:ss"),
+        this.moment().format("YYYY-MM-DD HH:mm:ss")
+      ], //时间
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            }
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            }
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            }
+          }
+        ]
+      } //时间快捷选项
+    };
+  },
+  methods: {
+    SizeChange(val) {
+      // 改变每页的条数
+      this.Size = val;
+      this.loadDataGridData();
+    },
+    CurrentChange(val) {
+      //改变页数
+      this.Page = val;
+      this.loadDataGridData();
+    },
+    loadDataGridData() {
+      this.loading = true;
+      this.$http
+        .post(this.nozzle.taskInfoGetHisInfo, {
+          condition: this.condition,
+          pageNo: this.Page,
+          pageSize: this.Size,
+          st: this.TimeValue[0],
+          et: this.TimeValue[1]
+        })
+        .then(response => {
+          this.loading = false;
+          this.HistoryTableData = response.data.data;
+          this.DataLength = response.data.total;
+        })
+        .catch(response => {
+          this.loading = false;
+          this.$message({
+            showClose: true,
+            message: "请求日志失败",
+            type: "warning"
+          });
+        });
+    }
+  },
+  mounted: function() {
+    this.loadDataGridData();
+  }
+};
+</script>
+
+<style scoped>
+#MyHomework_History {
+  width: 100%;
+  height: 100%;
+}
+/* 顶部搜索 */
+#MH_HTopSearchBox {
+  width: 100%;
+  height: 60px;
+  line-height: 60px;
+  text-align: left;
+  color: white;
+}
+#MH_HTopSearchBox .el-input {
+  width: 200px;
+  margin: 0 10px;
+}
+.SelectTitle {
+  display: inline-block;
+  margin-left: 5px;
+  text-align: center;
+  height: 60px;
+  line-height: 60px;
+}
+/* 主体内容 */
+#MH_HCertent {
+  width: 100%;
+  height: calc(100% - 70px);
+  margin-top: 10px;
+  background: rgba(53, 53, 53, 0.5);
+}
+</style>
diff --git a/src/components/Engineering/MyHomework_Now.vue b/src/components/Engineering/MyHomework_Now.vue
new file mode 100644
index 0000000..cb51cf0
--- /dev/null
+++ b/src/components/Engineering/MyHomework_Now.vue
@@ -0,0 +1,157 @@
+<template>
+  <div id="MyHomework_Now">
+    <div id="MH_NTopSearchBox">
+      <span class="SelectTitle">站点查询：</span>
+      <el-input v-model="condition" placeholder="请输入站点名称/编号"></el-input>
+      <el-button type="primary" icon="el-icon-search" @click="loadDataGridData">搜索</el-button>
+      <!-- <img src="http://medical-cloud.fvzz.cn/newfiber/upload/file/190710014205427190989.190710014204374189345.jpg" alt=""> -->
+    </div>
+    <div id="MH_NCertent">
+      <el-table
+        :data="HistoryTableData"
+        style="width: 100%;height:calc(100% - 45px)"
+        v-loading="loading"
+        element-loading-text="拼命加载中"
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+        stripe
+      >
+        <el-table-column prop="siteNo" label="站点编号"></el-table-column>
+        <el-table-column prop="siteName" label="站点名称"></el-table-column>
+        <el-table-column prop="taskUserNo" label="作业人账号"></el-table-column>
+        <el-table-column prop="taskUserName" label="作业人姓名"></el-table-column>
+        <el-table-column prop="beginTime" label="上报时间"></el-table-column>
+        <el-table-column prop="taskRemark" label="备注"></el-table-column>
+        <el-table-column prop="pics" label="查看图片">
+          <template slot-scope="scope">
+            <img
+              v-for="item in scope.row.pics"
+              :src="item.pictureUrl"
+              alt
+              class="TableImg"
+              @click="YuLan(item.pictureUrl)"
+              title="点击查看图片"
+            />
+            <span v-if="scope.row.pics.length==0">无图片</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="SizeChange"
+        @current-change="CurrentChange"
+        :current-page="Page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="Size"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="DataLength"
+        style="margin-top:10px;"
+      ></el-pagination>
+    </div>
+    <el-dialog title="图片预览" :visible.sync="dialogVisible" width="40%">
+      <img :src="YuLanImgUrl" alt id="YuLanImg" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { message } from "./../../util/item";
+export default {
+  name: "MyHomework_Now",
+  data: function() {
+    return {
+      condition: "",
+      HistoryTableData: [], //历史数据表格数据
+      Page: 1, //分页默认显示页
+      DataLength: 0, //分页上显示的数据总条数
+      Size: 10, //分页上显示的每页的条数
+      loading: false,
+      dialogVisible: false
+    };
+  },
+  methods: {
+    SizeChange(val) {
+      // 改变每页的条数
+      this.Size = val;
+      this.loadDataGridData();
+    },
+    CurrentChange(val) {
+      //改变页数
+      this.Page = val;
+      this.loadDataGridData();
+    },
+    loadDataGridData() {
+      this.loading = true;
+      this.$http
+        .post(this.nozzle.taskInfoGetTempInfo, {
+          condition: this.condition,
+          pageNo: this.Page,
+          pageSize: this.Size
+        })
+        .then(response => {
+          this.loading = false;
+          this.HistoryTableData = response.data.data;
+          this.DataLength = response.data.total;
+        })
+        .catch(response => {
+          this.loading = false;
+          this.$message({
+            showClose: true,
+            message: "请求日志失败",
+            type: "warning"
+          });
+        });
+    },
+    YuLan(V) {
+      this.YuLanImgUrl = V;
+      this.dialogVisible = true;
+    }
+  },
+  mounted: function() {
+    this.loadDataGridData();
+  }
+};
+</script>
+
+<style scoped>
+#MyHomework_Now {
+  width: 100%;
+  height: 100%;
+}
+/* 顶部搜索 */
+#MH_NTopSearchBox {
+  width: 100%;
+  height: 60px;
+  line-height: 60px;
+  text-align: left;
+  color: white;
+}
+#MH_NTopSearchBox .el-input {
+  width: 200px;
+  margin: 0 10px;
+}
+.SelectTitle {
+  display: inline-block;
+  margin-left: 5px;
+  text-align: center;
+  height: 60px;
+  line-height: 60px;
+}
+/* 主体内容 */
+#MH_NCertent {
+  width: 100%;
+  height: calc(100% - 70px);
+  margin-top: 10px;
+  background: rgba(53, 53, 53, 0.5);
+}
+/* 表格内图片 */
+.TableImg {
+  width: 30px;
+  height: 30px;
+  cursor: pointer;
+}
+/* 预览图片 */
+#YuLanImg {
+  width: 100%;
+  height: auto;
+}
+</style>
diff --git a/src/components/Engineering/Nowfault.vue b/src/components/Engineering/Nowfault.vue
index 51f1492..8eb6c29 100644
--- a/src/components/Engineering/Nowfault.vue
+++ b/src/components/Engineering/Nowfault.vue
@@ -34,7 +34,7 @@
     </div>
   </div>
 </template>
-
+ 
 <script>
 export default {
   name: "Nowfault",
diff --git a/src/components/configure/PatrolConfiguration.vue b/src/components/configure/PatrolConfiguration.vue
new file mode 100644
index 0000000..bdff98e
--- /dev/null
+++ b/src/components/configure/PatrolConfiguration.vue
@@ -0,0 +1,97 @@
+<template>
+  <div id="PatrolConfiguration">
+    <div id="PCTopSearchBox">
+      <span class="SelectTitle">平台：</span>
+      <el-select v-model="Project" filterable placeholder="请选择" @change="loadProjectUser(Project)">
+        <el-option
+          v-for="item in ProjectOptions"
+          :key="item.platform_code"
+          :label="item.name"
+          :value="item.platform_code"
+        ></el-option>
+      </el-select>
+    </div>
+    <div id="PCCertent"></div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "PatrolConfiguration",
+  data: function() {
+    return {
+      Project: "", //平台
+      ProjectOptions: [
+        {
+          name: "全部",
+          platform_code: ""
+        }
+      ] //平台的数据源
+    };
+  },
+  methods: {
+    // 获取所有平台
+    loadAllProject() {
+      this.$http
+        .get(this.nozzle.StationBaseControllerQueryPlatform)
+        .then(response => {
+          if (response.data.result.list.length > 0) {
+            this.ProjectOptions = this.ProjectOptions.concat(
+              response.data.result.list
+            );
+            this.Project = this.ProjectOptions[0].platform_code;
+          } else {
+            this.$message({
+              showClose: true,
+              message: "无项目",
+              type: "warning"
+            });
+          }
+        })
+        .catch(response => {
+          this.$message({
+            showClose: true,
+            message: "请求平台失败",
+            type: "warning"
+          });
+        });
+    }
+  },
+  mounted: function() {
+      this.loadAllProject()
+  }
+};
+</script>
+
+<style scoped>
+#PatrolConfiguration {
+  width: 100%;
+  height: 100%;
+}
+/* 顶部搜索 */
+#PCTopSearchBox {
+  width: 100%;
+  height: 60px;
+  line-height: 60px;
+  text-align: left;
+  color: white;
+}
+#PCTopSearchBox .el-input {
+  width: 200px;
+  margin: 0 10px;
+}
+.SelectTitle {
+  display: inline-block;
+  margin-left: 5px;
+  text-align: center;
+  height: 60px;
+  line-height: 60px;
+}
+/* 主体内容 */
+#PCCertent {
+  width: 100%;
+  height: calc(100% - 70px);
+  margin-top: 10px;
+  background: rgba(53, 53, 53, 0.5);
+}
+</style>
\ No newline at end of file
diff --git a/src/components/index.vue b/src/components/index.vue
index d8b1be8..249e547 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="IndexTop">
-    <el-container>
+    <el-container style="height:100%">
       <el-header height="40px">
         <img
           src="../../static/img/indexTop1.png"
@@ -39,7 +39,7 @@
           </el-dropdown-menu>
         </el-dropdown>
       </el-header>
-      <el-container>
+      <el-container style="height: calc(100% - 40px);">
         <el-aside :style="'width:' + MenuWidth + 'px'">
           <el-menu
             default-active="2-1"
@@ -73,6 +73,7 @@
               <el-menu-item index="4-1" route="/configure/AlarmConfiguration">报警配置</el-menu-item>
               <el-menu-item index="4-2" route="/configure/PushRules">推送规则</el-menu-item>
               <el-menu-item index="4-3" route="/configure/AlarmLog">报警日志</el-menu-item>
+              <el-menu-item index="4-4" route="/configure/PatrolConfiguration">巡检配置</el-menu-item>
             </el-submenu>
             <el-submenu index="5">
               <template slot="title">
@@ -105,6 +106,7 @@
               </template>
               <el-menu-item index="8-1" route="/Engineering/Nowfault">站点实时故障数据</el-menu-item>
               <el-menu-item index="8-2" route="/Engineering/HistoricalFault">站点历史故障数据</el-menu-item>
+              <el-menu-item index="8-3" route="/Engineering/MyHomework">我的作业</el-menu-item>
             </el-submenu>
           </el-menu>
         </el-aside>
@@ -239,6 +241,7 @@
   -ms-user-select: none; /*IE10+*/
   -khtml-user-select: none; /*早期的浏览器*/
   user-select: none;
+  /* overflow: auto; */
 }
 #ContentView {
   width: 100%;
@@ -330,7 +333,6 @@
 }
 .el-container {
   width: 100%;
-  height: 100%;
 }
 </style>
 
diff --git a/src/router/index.js b/src/router/index.js
index 7772755..751b201 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -21,6 +21,7 @@
 import AlarmConfiguration from '@/components/configure/AlarmConfiguration' //报警配置
 import PushRules from '@/components/configure/PushRules' //推送规则
 import AlarmLog from '@/components/configure/AlarmLog' //推送规则
+import PatrolConfiguration from '@/components/configure/PatrolConfiguration' //巡检配置
 // 消息管理
 import MessageQuery from '@/components/MessageManagement/MessageQuery' //消息查询
 import MessageStatistics from '@/components/MessageManagement/MessageStatistics' //消息统计
@@ -36,6 +37,7 @@
 // 工程作业
 import Nowfault from '@/components/Engineering/Nowfault' //查询实时故障数据
 import HistoricalFault from '@/components/Engineering/HistoricalFault' //查询历史故障数据
+import MyHomework from '@/components/Engineering/MyHomework' //我的作业
 
 
 
@@ -76,6 +78,10 @@
     name: 'AlarmLog',
     component: AlarmLog
   },{
+    path: '/configure/PatrolConfiguration',// 配置中心--巡检配置
+    name: 'PatrolConfiguration',
+    component: PatrolConfiguration
+  },{
     path: '/MessageManagement/MessageQuery',// 消息管理--消息查询
     name: 'MessageQuery',
     component: MessageQuery
@@ -117,6 +123,10 @@
     path: '/Engineering/HistoricalFault',// 查询历史故障数据
     name: 'HistoricalFault',
     component: HistoricalFault
+  },{
+    path: '/Engineering/MyHomework',// 查询历史故障数据
+    name: 'MyHomework',
+    component: MyHomework
   },]
   },{
     path: '/login',

diff --git a/src/components/Engineering/MyHomework.vue b/src/components/Engineering/MyHomework.vue
new file mode 100644
index 0000000..63b3c62
--- /dev/null
+++ b/src/components/Engineering/MyHomework.vue
@@ -0,0 +1,47 @@
+<template>
+  <div id="MyHomework">
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="实时作业" name="first">
+        <child1 v-if="isChildUpdate1"></child1>
+      </el-tab-pane>
+      <el-tab-pane label="历史作业" name="second">
+        <child2 v-if="!isChildUpdate1"></child2>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import MyHomework_Now from "@/components/Engineering/MyHomework_Now"; //我的作业-实时作业
+import MyHomework_History from "@/components/Engineering/MyHomework_History"; //我的作业-历史作业
+export default {
+  name: "MyHomework",
+  components: {
+    child1: MyHomework_Now,
+    child2: MyHomework_History
+  },
+  data: function() {
+    return {
+      activeName: "first",
+      isChildUpdate1: true
+    };
+  },
+  methods: {
+    handleClick(tab, event) {
+      if (tab.name == "first") {
+        this.isChildUpdate1 = true;
+      } else if (tab.name == "second") {
+        this.isChildUpdate1 = false;
+      }
+    }
+  },
+  mounted: function() {}
+};
+</script>
+
+<style scoped>
+#MyHomework {
+  width: 100%;
+  height: 100%;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/Engineering/MyHomework_History.vue b/src/components/Engineering/MyHomework_History.vue
new file mode 100644
index 0000000..d7125be
--- /dev/null
+++ b/src/components/Engineering/MyHomework_History.vue
@@ -0,0 +1,175 @@
+<template>
+  <div id="MyHomework_History">
+    <div id="MH_HTopSearchBox">
+      <span class="SelectTitle">站点查询：</span>
+      <el-input v-model="condition" placeholder="请输入站点名称/编号"></el-input>
+      <span class="SelectTitle">时间选择：</span>
+      <el-date-picker
+        v-model="TimeValue"
+        type="datetimerange"
+        align="right"
+        unlink-panels
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+      ></el-date-picker>
+      <el-button type="primary" icon="el-icon-search" @click="loadDataGridData">搜索</el-button>
+    </div>
+    <div id="MH_HCertent">
+      <el-table
+        :data="HistoryTableData"
+        style="width: 100%;height:calc(100% - 45px)"
+        v-loading="loading"
+        element-loading-text="拼命加载中"
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+        stripe
+      >
+        <el-table-column prop="siteNo" label="站点编号"></el-table-column>
+        <el-table-column prop="siteName" label="站点名称"></el-table-column>
+        <el-table-column prop="taskUserNo" label="作业人账号"></el-table-column>
+        <el-table-column prop="taskUserName" label="作业人姓名"></el-table-column>
+        <el-table-column prop="beginTime" label="上报时间"></el-table-column>
+        <el-table-column prop="taskRemark" label="备注"></el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="SizeChange"
+        @current-change="CurrentChange"
+        :current-page="Page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="Size"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="DataLength"
+        style="margin-top:10px;"
+      ></el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import { message } from "./../../util/item";
+export default {
+  name: "MyHomework_History",
+  data: function() {
+    return {
+      condition: "",
+      HistoryTableData: [], //历史数据表格数据
+      Page: 1, //分页默认显示页
+      DataLength: 0, //分页上显示的数据总条数
+      Size: 10, //分页上显示的每页的条数
+      loading: false,
+      TimeValue: [
+        this.moment()
+          .subtract("days", 3)
+          .format("YYYY-MM-DD HH:mm:ss"),
+        this.moment().format("YYYY-MM-DD HH:mm:ss")
+      ], //时间
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            }
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            }
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            }
+          }
+        ]
+      } //时间快捷选项
+    };
+  },
+  methods: {
+    SizeChange(val) {
+      // 改变每页的条数
+      this.Size = val;
+      this.loadDataGridData();
+    },
+    CurrentChange(val) {
+      //改变页数
+      this.Page = val;
+      this.loadDataGridData();
+    },
+    loadDataGridData() {
+      this.loading = true;
+      this.$http
+        .post(this.nozzle.taskInfoGetHisInfo, {
+          condition: this.condition,
+          pageNo: this.Page,
+          pageSize: this.Size,
+          st: this.TimeValue[0],
+          et: this.TimeValue[1]
+        })
+        .then(response => {
+          this.loading = false;
+          this.HistoryTableData = response.data.data;
+          this.DataLength = response.data.total;
+        })
+        .catch(response => {
+          this.loading = false;
+          this.$message({
+            showClose: true,
+            message: "请求日志失败",
+            type: "warning"
+          });
+        });
+    }
+  },
+  mounted: function() {
+    this.loadDataGridData();
+  }
+};
+</script>
+
+<style scoped>
+#MyHomework_History {
+  width: 100%;
+  height: 100%;
+}
+/* 顶部搜索 */
+#MH_HTopSearchBox {
+  width: 100%;
+  height: 60px;
+  line-height: 60px;
+  text-align: left;
+  color: white;
+}
+#MH_HTopSearchBox .el-input {
+  width: 200px;
+  margin: 0 10px;
+}
+.SelectTitle {
+  display: inline-block;
+  margin-left: 5px;
+  text-align: center;
+  height: 60px;
+  line-height: 60px;
+}
+/* 主体内容 */
+#MH_HCertent {
+  width: 100%;
+  height: calc(100% - 70px);
+  margin-top: 10px;
+  background: rgba(53, 53, 53, 0.5);
+}
+</style>
diff --git a/src/components/Engineering/MyHomework_Now.vue b/src/components/Engineering/MyHomework_Now.vue
new file mode 100644
index 0000000..cb51cf0
--- /dev/null
+++ b/src/components/Engineering/MyHomework_Now.vue
@@ -0,0 +1,157 @@
+<template>
+  <div id="MyHomework_Now">
+    <div id="MH_NTopSearchBox">
+      <span class="SelectTitle">站点查询：</span>
+      <el-input v-model="condition" placeholder="请输入站点名称/编号"></el-input>
+      <el-button type="primary" icon="el-icon-search" @click="loadDataGridData">搜索</el-button>
+      <!-- <img src="http://medical-cloud.fvzz.cn/newfiber/upload/file/190710014205427190989.190710014204374189345.jpg" alt=""> -->
+    </div>
+    <div id="MH_NCertent">
+      <el-table
+        :data="HistoryTableData"
+        style="width: 100%;height:calc(100% - 45px)"
+        v-loading="loading"
+        element-loading-text="拼命加载中"
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+        stripe
+      >
+        <el-table-column prop="siteNo" label="站点编号"></el-table-column>
+        <el-table-column prop="siteName" label="站点名称"></el-table-column>
+        <el-table-column prop="taskUserNo" label="作业人账号"></el-table-column>
+        <el-table-column prop="taskUserName" label="作业人姓名"></el-table-column>
+        <el-table-column prop="beginTime" label="上报时间"></el-table-column>
+        <el-table-column prop="taskRemark" label="备注"></el-table-column>
+        <el-table-column prop="pics" label="查看图片">
+          <template slot-scope="scope">
+            <img
+              v-for="item in scope.row.pics"
+              :src="item.pictureUrl"
+              alt
+              class="TableImg"
+              @click="YuLan(item.pictureUrl)"
+              title="点击查看图片"
+            />
+            <span v-if="scope.row.pics.length==0">无图片</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="SizeChange"
+        @current-change="CurrentChange"
+        :current-page="Page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="Size"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="DataLength"
+        style="margin-top:10px;"
+      ></el-pagination>
+    </div>
+    <el-dialog title="图片预览" :visible.sync="dialogVisible" width="40%">
+      <img :src="YuLanImgUrl" alt id="YuLanImg" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { message } from "./../../util/item";
+export default {
+  name: "MyHomework_Now",
+  data: function() {
+    return {
+      condition: "",
+      HistoryTableData: [], //历史数据表格数据
+      Page: 1, //分页默认显示页
+      DataLength: 0, //分页上显示的数据总条数
+      Size: 10, //分页上显示的每页的条数
+      loading: false,
+      dialogVisible: false
+    };
+  },
+  methods: {
+    SizeChange(val) {
+      // 改变每页的条数
+      this.Size = val;
+      this.loadDataGridData();
+    },
+    CurrentChange(val) {
+      //改变页数
+      this.Page = val;
+      this.loadDataGridData();
+    },
+    loadDataGridData() {
+      this.loading = true;
+      this.$http
+        .post(this.nozzle.taskInfoGetTempInfo, {
+          condition: this.condition,
+          pageNo: this.Page,
+          pageSize: this.Size
+        })
+        .then(response => {
+          this.loading = false;
+          this.HistoryTableData = response.data.data;
+          this.DataLength = response.data.total;
+        })
+        .catch(response => {
+          this.loading = false;
+          this.$message({
+            showClose: true,
+            message: "请求日志失败",
+            type: "warning"
+          });
+        });
+    },
+    YuLan(V) {
+      this.YuLanImgUrl = V;
+      this.dialogVisible = true;
+    }
+  },
+  mounted: function() {
+    this.loadDataGridData();
+  }
+};
+</script>
+
+<style scoped>
+#MyHomework_Now {
+  width: 100%;
+  height: 100%;
+}
+/* 顶部搜索 */
+#MH_NTopSearchBox {
+  width: 100%;
+  height: 60px;
+  line-height: 60px;
+  text-align: left;
+  color: white;
+}
+#MH_NTopSearchBox .el-input {
+  width: 200px;
+  margin: 0 10px;
+}
+.SelectTitle {
+  display: inline-block;
+  margin-left: 5px;
+  text-align: center;
+  height: 60px;
+  line-height: 60px;
+}
+/* 主体内容 */
+#MH_NCertent {
+  width: 100%;
+  height: calc(100% - 70px);
+  margin-top: 10px;
+  background: rgba(53, 53, 53, 0.5);
+}
+/* 表格内图片 */
+.TableImg {
+  width: 30px;
+  height: 30px;
+  cursor: pointer;
+}
+/* 预览图片 */
+#YuLanImg {
+  width: 100%;
+  height: auto;
+}
+</style>
diff --git a/src/components/Engineering/Nowfault.vue b/src/components/Engineering/Nowfault.vue
index 51f1492..8eb6c29 100644
--- a/src/components/Engineering/Nowfault.vue
+++ b/src/components/Engineering/Nowfault.vue
@@ -34,7 +34,7 @@
     </div>
   </div>
 </template>
-
+ 
 <script>
 export default {
   name: "Nowfault",
diff --git a/src/components/configure/PatrolConfiguration.vue b/src/components/configure/PatrolConfiguration.vue
new file mode 100644
index 0000000..bdff98e
--- /dev/null
+++ b/src/components/configure/PatrolConfiguration.vue
@@ -0,0 +1,97 @@
+<template>
+  <div id="PatrolConfiguration">
+    <div id="PCTopSearchBox">
+      <span class="SelectTitle">平台：</span>
+      <el-select v-model="Project" filterable placeholder="请选择" @change="loadProjectUser(Project)">
+        <el-option
+          v-for="item in ProjectOptions"
+          :key="item.platform_code"
+          :label="item.name"
+          :value="item.platform_code"
+        ></el-option>
+      </el-select>
+    </div>
+    <div id="PCCertent"></div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "PatrolConfiguration",
+  data: function() {
+    return {
+      Project: "", //平台
+      ProjectOptions: [
+        {
+          name: "全部",
+          platform_code: ""
+        }
+      ] //平台的数据源
+    };
+  },
+  methods: {
+    // 获取所有平台
+    loadAllProject() {
+      this.$http
+        .get(this.nozzle.StationBaseControllerQueryPlatform)
+        .then(response => {
+          if (response.data.result.list.length > 0) {
+            this.ProjectOptions = this.ProjectOptions.concat(
+              response.data.result.list
+            );
+            this.Project = this.ProjectOptions[0].platform_code;
+          } else {
+            this.$message({
+              showClose: true,
+              message: "无项目",
+              type: "warning"
+            });
+          }
+        })
+        .catch(response => {
+          this.$message({
+            showClose: true,
+            message: "请求平台失败",
+            type: "warning"
+          });
+        });
+    }
+  },
+  mounted: function() {
+      this.loadAllProject()
+  }
+};
+</script>
+
+<style scoped>
+#PatrolConfiguration {
+  width: 100%;
+  height: 100%;
+}
+/* 顶部搜索 */
+#PCTopSearchBox {
+  width: 100%;
+  height: 60px;
+  line-height: 60px;
+  text-align: left;
+  color: white;
+}
+#PCTopSearchBox .el-input {
+  width: 200px;
+  margin: 0 10px;
+}
+.SelectTitle {
+  display: inline-block;
+  margin-left: 5px;
+  text-align: center;
+  height: 60px;
+  line-height: 60px;
+}
+/* 主体内容 */
+#PCCertent {
+  width: 100%;
+  height: calc(100% - 70px);
+  margin-top: 10px;
+  background: rgba(53, 53, 53, 0.5);
+}
+</style>
\ No newline at end of file
diff --git a/src/components/index.vue b/src/components/index.vue
index d8b1be8..249e547 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="IndexTop">
-    <el-container>
+    <el-container style="height:100%">
       <el-header height="40px">
         <img
           src="../../static/img/indexTop1.png"
@@ -39,7 +39,7 @@
           </el-dropdown-menu>
         </el-dropdown>
       </el-header>
-      <el-container>
+      <el-container style="height: calc(100% - 40px);">
         <el-aside :style="'width:' + MenuWidth + 'px'">
           <el-menu
             default-active="2-1"
@@ -73,6 +73,7 @@
               <el-menu-item index="4-1" route="/configure/AlarmConfiguration">报警配置</el-menu-item>
               <el-menu-item index="4-2" route="/configure/PushRules">推送规则</el-menu-item>
               <el-menu-item index="4-3" route="/configure/AlarmLog">报警日志</el-menu-item>
+              <el-menu-item index="4-4" route="/configure/PatrolConfiguration">巡检配置</el-menu-item>
             </el-submenu>
             <el-submenu index="5">
               <template slot="title">
@@ -105,6 +106,7 @@
               </template>
               <el-menu-item index="8-1" route="/Engineering/Nowfault">站点实时故障数据</el-menu-item>
               <el-menu-item index="8-2" route="/Engineering/HistoricalFault">站点历史故障数据</el-menu-item>
+              <el-menu-item index="8-3" route="/Engineering/MyHomework">我的作业</el-menu-item>
             </el-submenu>
           </el-menu>
         </el-aside>
@@ -239,6 +241,7 @@
   -ms-user-select: none; /*IE10+*/
   -khtml-user-select: none; /*早期的浏览器*/
   user-select: none;
+  /* overflow: auto; */
 }
 #ContentView {
   width: 100%;
@@ -330,7 +333,6 @@
 }
 .el-container {
   width: 100%;
-  height: 100%;
 }
 </style>
 
diff --git a/src/router/index.js b/src/router/index.js
index 7772755..751b201 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -21,6 +21,7 @@
 import AlarmConfiguration from '@/components/configure/AlarmConfiguration' //报警配置
 import PushRules from '@/components/configure/PushRules' //推送规则
 import AlarmLog from '@/components/configure/AlarmLog' //推送规则
+import PatrolConfiguration from '@/components/configure/PatrolConfiguration' //巡检配置
 // 消息管理
 import MessageQuery from '@/components/MessageManagement/MessageQuery' //消息查询
 import MessageStatistics from '@/components/MessageManagement/MessageStatistics' //消息统计
@@ -36,6 +37,7 @@
 // 工程作业
 import Nowfault from '@/components/Engineering/Nowfault' //查询实时故障数据
 import HistoricalFault from '@/components/Engineering/HistoricalFault' //查询历史故障数据
+import MyHomework from '@/components/Engineering/MyHomework' //我的作业
 
 
 
@@ -76,6 +78,10 @@
     name: 'AlarmLog',
     component: AlarmLog
   },{
+    path: '/configure/PatrolConfiguration',// 配置中心--巡检配置
+    name: 'PatrolConfiguration',
+    component: PatrolConfiguration
+  },{
     path: '/MessageManagement/MessageQuery',// 消息管理--消息查询
     name: 'MessageQuery',
     component: MessageQuery
@@ -117,6 +123,10 @@
     path: '/Engineering/HistoricalFault',// 查询历史故障数据
     name: 'HistoricalFault',
     component: HistoricalFault
+  },{
+    path: '/Engineering/MyHomework',// 查询历史故障数据
+    name: 'MyHomework',
+    component: MyHomework
   },]
   },{
     path: '/login',
diff --git a/src/util/CHGTwo.js b/src/util/CHGTwo.js
index e93811d..20efeb7 100644
--- a/src/util/CHGTwo.js
+++ b/src/util/CHGTwo.js
@@ -22,6 +22,8 @@
   'faultInfoGetTempInfo':'/faultInfo/getTempInfo',//工程作业-查询实时故障数据
   'faultInfoGetHisInfo':'/faultInfo/getHisInfo',//工程作业-查询历史故障数据
   'StationBaseControllerGetPlatFormSiteTree':'/StationBaseController/getPlatFormSiteTree',//工程作业-平台站点二级树
+  'taskInfoGetTempInfo':'/taskInfo/getTempInfo',//工程作业-实时作业
+  'taskInfoGetHisInfo':'/taskInfo/getHisInfo',//工程作业-历史作业