diff --git a/src/utils/api/index.js b/src/utils/api/index.js
index cf5486e..c8c14bd 100644
--- a/src/utils/api/index.js
+++ b/src/utils/api/index.js
@@ -775,3 +775,13 @@ export function changePermission(data) {
     data,
   });
 }
+
+//装置信息报
+//故障信息报
+export function getTermFaultsApi(data) {
+  return request({
+    url: "/xymanager/getTermFaults",
+    method: "post",
+    data,
+  });
+}
diff --git a/src/views/photographicDevice/components/baseInfor.vue b/src/views/photographicDevice/components/baseInfor.vue
index 37a1793..1f01393 100644
--- a/src/views/photographicDevice/components/baseInfor.vue
+++ b/src/views/photographicDevice/components/baseInfor.vue
@@ -192,7 +192,6 @@ export default {
   },
 };
 </script>
-<<<<<<< HEAD
 <style lang="less">
 .baseInforDialog {
   .pageNation {
@@ -207,6 +206,3 @@ export default {
   }
 }
 </style>
-=======
-<style lang="less" scoped></style>
->>>>>>> hn1.0
diff --git a/src/views/photographicDevice/components/faultInfomation.vue b/src/views/photographicDevice/components/faultInfomation.vue
new file mode 100644
index 0000000..e7ac2f7
--- /dev/null
+++ b/src/views/photographicDevice/components/faultInfomation.vue
@@ -0,0 +1,165 @@
+<template>
+  <el-dialog
+    class="faultInfo"
+    title="故障信息报"
+    :visible.sync="isShow"
+    :close-on-click-modal="false"
+    width="1000px"
+  >
+    <el-form :inline="true" :model="formdata" class="demo-form-inline">
+      <el-form-item label="开始日期">
+        <el-date-picker
+          v-model="formdata.starttime"
+          type="datetime"
+          placeholder="开始日期"
+          value-format="timestamp"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="结束日期">
+        <el-date-picker
+          v-model="formdata.endtime"
+          type="datetime"
+          default-time="23:59:59"
+          placeholder="结束日期"
+          value-format="timestamp"
+          class="ml10"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+        <el-button type="primary">导出</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      ref="multipleTable"
+      :data="listData"
+      stripe
+      tooltip-effect="dark"
+      style="width: 100%"
+      v-loading="loading"
+    >
+      <template slot="empty">
+        <el-empty :image-size="160" description="暂无数据"></el-empty>
+      </template>
+      <el-table-column min-width="45" label="序号">
+        <template slot-scope="scope">
+          <span>{{ (page - 1) * pageSize + scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="fault_time"
+        label="采集时间"
+        min-width="120"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="msg"
+        label="故障信息"
+        min-width="120"
+        show-overflow-tooltip
+      ></el-table-column>
+    </el-table>
+    <div class="pageNation">
+      <el-pagination
+        @current-change="handleCurrentChange"
+        @size-change="handleSizeChange"
+        :current-page="page"
+        :page-size="pageSize"
+        layout="sizes, prev, pager, next, jumper,total"
+        :total="total"
+        background
+      >
+      </el-pagination>
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="isShow = false">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import { getTermFaultsApi } from "@/utils/api/index";
+export default {
+  data() {
+    return {
+      isShow: false,
+      formdata: {},
+      rowInfo: "",
+      listData: [],
+      loading: false,
+      page: 1, // 当前页数
+      pageSize: 10, // 每页数量
+      total: 0, //总条数
+    };
+  },
+  mounted() {
+    this.$set(
+      this.formdata,
+      "starttime",
+      new Date(new Date().toLocaleDateString()).getTime()
+    );
+    this.$set(this.formdata, "endtime", new Date().getTime());
+  },
+  methods: {
+    //查询
+    onSubmit() {
+      if (this.formdata.starttime > this.formdata.endtime) {
+        return this.$message({
+          duration: 1500,
+          showClose: true,
+          message: "开始日期不能大于结束日期",
+          type: "warning",
+        });
+      }
+      this.getfaultinfo();
+    },
+    //获取数据
+    getfaultinfo() {
+      this.loading = true;
+      getTermFaultsApi({
+        termid: this.rowInfo.id,
+        pageindex: this.page,
+        pagesize: this.pageSize,
+      }).then((res) => {
+        this.listData = res.data.list;
+        this.total = res.data.total;
+        this.loading = false;
+      });
+    },
+    //点击分页
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getfaultinfo();
+    },
+    //每页条数
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.getfaultinfo();
+    },
+    display(row) {
+      console.log(row);
+      this.rowInfo = row;
+      this.isShow = true;
+      this.getfaultinfo();
+    },
+    hide() {
+      this.isShow = false;
+    },
+  },
+};
+</script>
+<style lang="less">
+.faultInfo {
+  .pageNation {
+    justify-content: flex-start;
+    margin-top: 16px;
+    .el-pagination {
+      padding: 0px;
+      .el-select .el-input {
+        margin-left: 0px;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/photographicDevice/components/gpsSite.vue b/src/views/photographicDevice/components/gpsSite.vue
index 54c8e99..cada997 100644
--- a/src/views/photographicDevice/components/gpsSite.vue
+++ b/src/views/photographicDevice/components/gpsSite.vue
@@ -174,7 +174,6 @@ export default {
   },
 };
 </script>
-<<<<<<< HEAD
 <style lang="less">
 .gpsSiteDialog {
   .pageNation {
@@ -189,6 +188,3 @@ export default {
   }
 }
 </style>
-=======
-<style lang="less" scoped></style>
->>>>>>> hn1.0
diff --git a/src/views/photographicDevice/components/parameterSetDialog.vue b/src/views/photographicDevice/components/parameterSetDialog.vue
index 7bd6955..800fcdc 100644
--- a/src/views/photographicDevice/components/parameterSetDialog.vue
+++ b/src/views/photographicDevice/components/parameterSetDialog.vue
@@ -176,7 +176,7 @@
                 >
                   <el-form-item label="IP地址">
                     <el-input
-                      v-model="upperComputer.ip"
+                      v-model="upperComputer.ipStr"
                       disabled="disabled"
                     ></el-input>
                   </el-form-item>
diff --git a/src/views/photographicDevice/components/workStatus.vue b/src/views/photographicDevice/components/workStatus.vue
index 67c6318..3c63569 100644
--- a/src/views/photographicDevice/components/workStatus.vue
+++ b/src/views/photographicDevice/components/workStatus.vue
@@ -206,7 +206,6 @@ export default {
   },
 };
 </script>
-<<<<<<< HEAD
 <style lang="less">
 .workStatus {
   .pageNation {
@@ -221,6 +220,3 @@ export default {
   }
 }
 </style>
-=======
-<style lang="less" scoped></style>
->>>>>>> hn1.0
diff --git a/src/views/photographicDevice/index.vue b/src/views/photographicDevice/index.vue
index 4cc07f3..63c1723 100644
--- a/src/views/photographicDevice/index.vue
+++ b/src/views/photographicDevice/index.vue
@@ -240,6 +240,9 @@
                     >运行状态</el-dropdown-item
                   >
                   <el-dropdown-item command="GPS">GPS位置</el-dropdown-item>
+                  <el-dropdown-item command="faultInfo"
+                    >故障信息报</el-dropdown-item
+                  >
                 </el-dropdown-menu>
               </el-dropdown>
               <el-button
@@ -312,6 +315,7 @@
     <workStatus ref="workStatus_ref"></workStatus>
     <runStatus ref="runStatus_ref"></runStatus>
     <gpsSite ref="gpsSite_ref"></gpsSite>
+    <faultInfomation ref="fultInfo_ref"></faultInfomation>
     <!-- 新增线路 -->
     <add-lineDialog ref="addlineDialogref"></add-lineDialog>
     <towerDialog ref="towerDialogref"></towerDialog>
@@ -334,6 +338,7 @@ import baseInfor from "./components/baseInfor.vue";
 import workStatus from "./components/workStatus.vue";
 import runStatus from "./components/runStatus.vue";
 import gpsSite from "./components/gpsSite.vue";
+import faultInfomation from "./components/faultInfomation.vue";
 import addLineDialog from "./components/addLineDialog.vue";
 import towerDialog from "./components/towerDialog.vue";
 export default {
@@ -349,6 +354,7 @@ export default {
     gpsSite,
     addLineDialog,
     towerDialog,
+    faultInfomation,
   },
   data() {
     return {
@@ -559,6 +565,9 @@ export default {
         case "GPS":
           this.$refs.gpsSite_ref.display();
           break;
+        case "faultInfo":
+          this.$refs.fultInfo_ref.display(row);
+          break;
         default:
           break;
       }