diff --git a/public/config/project.config.json b/public/config/project.config.json
index be63190..d323919 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://192.168.75.39:11308/",
+  "baseUrl": "http://111.198.10.15:11638/",
   "wsUrl": "ws://11.100.6.182:5001/websocket/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",

diff --git a/public/config/project.config.json b/public/config/project.config.json
index be63190..d323919 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://192.168.75.39:11308/",
+  "baseUrl": "http://111.198.10.15:11638/",
   "wsUrl": "ws://11.100.6.182:5001/websocket/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index c203b5d..5a032ad 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -103,7 +103,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: '0'
+      valueModel: ''
     }
   },
   computed: {

diff --git a/public/config/project.config.json b/public/config/project.config.json
index be63190..d323919 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://192.168.75.39:11308/",
+  "baseUrl": "http://111.198.10.15:11638/",
   "wsUrl": "ws://11.100.6.182:5001/websocket/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index c203b5d..5a032ad 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -103,7 +103,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: '0'
+      valueModel: ''
     }
   },
   computed: {
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..caa1a02 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -47,13 +47,14 @@
   },
   created() {
     this.fetchAlarmContentType()
-    this.fetchData()
+    // this.fetchData()
   },
   mounted() {
     const bodyWidth = this.$refs.alarmWellRank.$el.clientWidth
     if (bodyWidth < 566) {
       this.timeButtonSize = 'small'
     }
+    this.$refs.timeButtons.initTime()
   },
   methods: {
     // 获取排名列表

diff --git a/public/config/project.config.json b/public/config/project.config.json
index be63190..d323919 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://192.168.75.39:11308/",
+  "baseUrl": "http://111.198.10.15:11638/",
   "wsUrl": "ws://11.100.6.182:5001/websocket/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index c203b5d..5a032ad 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -103,7 +103,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: '0'
+      valueModel: ''
     }
   },
   computed: {
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..caa1a02 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -47,13 +47,14 @@
   },
   created() {
     this.fetchAlarmContentType()
-    this.fetchData()
+    // this.fetchData()
   },
   mounted() {
     const bodyWidth = this.$refs.alarmWellRank.$el.clientWidth
     if (bodyWidth < 566) {
       this.timeButtonSize = 'small'
     }
+    this.$refs.timeButtons.initTime()
   },
   methods: {
     // 获取排名列表
diff --git a/src/views/deviceManage/components/listLevelData.vue b/src/views/deviceManage/components/listLevelData.vue
new file mode 100644
index 0000000..a140aa6
--- /dev/null
+++ b/src/views/deviceManage/components/listLevelData.vue
@@ -0,0 +1,142 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          size="small"
+          :picker-options="pickerOptions"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          @change="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="24">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getWellDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'ListWellcoverData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'logtime', align: 'center' },
+        { text: '井盖状态', value: 'statusName', align: 'center' }
+      ], // 显示列
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getWellDataSingle(this.listQuery).then(response => {
+        const data = response.data.map(item => {
+          return { ...item, statusName: item.status === '1' ? '开启' : '心跳' }
+        })
+        this.list = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>

diff --git a/public/config/project.config.json b/public/config/project.config.json
index be63190..d323919 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://192.168.75.39:11308/",
+  "baseUrl": "http://111.198.10.15:11638/",
   "wsUrl": "ws://11.100.6.182:5001/websocket/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index c203b5d..5a032ad 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -103,7 +103,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: '0'
+      valueModel: ''
     }
   },
   computed: {
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..caa1a02 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -47,13 +47,14 @@
   },
   created() {
     this.fetchAlarmContentType()
-    this.fetchData()
+    // this.fetchData()
   },
   mounted() {
     const bodyWidth = this.$refs.alarmWellRank.$el.clientWidth
     if (bodyWidth < 566) {
       this.timeButtonSize = 'small'
     }
+    this.$refs.timeButtons.initTime()
   },
   methods: {
     // 获取排名列表
diff --git a/src/views/deviceManage/components/listLevelData.vue b/src/views/deviceManage/components/listLevelData.vue
new file mode 100644
index 0000000..a140aa6
--- /dev/null
+++ b/src/views/deviceManage/components/listLevelData.vue
@@ -0,0 +1,142 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          size="small"
+          :picker-options="pickerOptions"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          @change="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="24">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getWellDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'ListWellcoverData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'logtime', align: 'center' },
+        { text: '井盖状态', value: 'statusName', align: 'center' }
+      ], // 显示列
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getWellDataSingle(this.listQuery).then(response => {
+        const data = response.data.map(item => {
+          return { ...item, statusName: item.status === '1' ? '开启' : '心跳' }
+        })
+        this.list = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listPressureData.vue b/src/views/deviceManage/components/listPressureData.vue
new file mode 100644
index 0000000..3fb58a7
--- /dev/null
+++ b/src/views/deviceManage/components/listPressureData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          size="small"
+          :picker-options="pickerOptions"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          @change="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getH2SDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleH2SData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '压力(Pa)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '压力(Pa)'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getH2SDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>

diff --git a/public/config/project.config.json b/public/config/project.config.json
index be63190..d323919 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://192.168.75.39:11308/",
+  "baseUrl": "http://111.198.10.15:11638/",
   "wsUrl": "ws://11.100.6.182:5001/websocket/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index c203b5d..5a032ad 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -103,7 +103,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: '0'
+      valueModel: ''
     }
   },
   computed: {
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..caa1a02 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -47,13 +47,14 @@
   },
   created() {
     this.fetchAlarmContentType()
-    this.fetchData()
+    // this.fetchData()
   },
   mounted() {
     const bodyWidth = this.$refs.alarmWellRank.$el.clientWidth
     if (bodyWidth < 566) {
       this.timeButtonSize = 'small'
     }
+    this.$refs.timeButtons.initTime()
   },
   methods: {
     // 获取排名列表
diff --git a/src/views/deviceManage/components/listLevelData.vue b/src/views/deviceManage/components/listLevelData.vue
new file mode 100644
index 0000000..a140aa6
--- /dev/null
+++ b/src/views/deviceManage/components/listLevelData.vue
@@ -0,0 +1,142 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          size="small"
+          :picker-options="pickerOptions"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          @change="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="24">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getWellDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'ListWellcoverData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'logtime', align: 'center' },
+        { text: '井盖状态', value: 'statusName', align: 'center' }
+      ], // 显示列
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getWellDataSingle(this.listQuery).then(response => {
+        const data = response.data.map(item => {
+          return { ...item, statusName: item.status === '1' ? '开启' : '心跳' }
+        })
+        this.list = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listPressureData.vue b/src/views/deviceManage/components/listPressureData.vue
new file mode 100644
index 0000000..3fb58a7
--- /dev/null
+++ b/src/views/deviceManage/components/listPressureData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          size="small"
+          :picker-options="pickerOptions"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          @change="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getH2SDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleH2SData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '压力(Pa)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '压力(Pa)'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getH2SDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index c501fde..ce6ce89 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -63,6 +63,8 @@
 import listHydrantData from './components/listHydrantData'
 import listWellLocaData from './components/listWellLocaData'
 import ListH2SData from './components/listH2SData'
+import listLevelData from './components/listLevelData'
+import listPressureData from './components/listPressureData'
 import SingleGasDetectorData from '@/views/deviceManage/components/listGasDetectorData'
 
 export default {
@@ -80,7 +82,9 @@
     listTubeData,
     listWellcoverData,
     listWellLocaData,
-    listHydrantData
+    listHydrantData,
+    listPressureData,
+    listLevelData
   },
   data() {
     return {
@@ -112,7 +116,9 @@
         '10': 'list-liquid-gas-data',
         '11': 'list-hydrant-data',
         '12': 'list-tube-data',
+        '13': 'list-level-data',
         '14': 'list-h2-s-data',
+        '31': 'list-pressure-data',
         '101': 'single-gas-detector-data'
       } // 组件对照表
     }
@@ -124,6 +130,8 @@
       this.deviceForm = row
       // 展示相对应的设备列表组件
       this.cmpName = this.compDict[row.deviceType]
+      console.log(row.deviceType, 'row.deviceType')
+      console.log(this.cmpName, 'this.cmpName')
       setTimeout(() => {
         this.$refs.dataDetail.init()
       }, 100)

diff --git a/public/config/project.config.json b/public/config/project.config.json
index be63190..d323919 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://192.168.75.39:11308/",
+  "baseUrl": "http://111.198.10.15:11638/",
   "wsUrl": "ws://11.100.6.182:5001/websocket/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index c203b5d..5a032ad 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -103,7 +103,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: '0'
+      valueModel: ''
     }
   },
   computed: {
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..caa1a02 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -47,13 +47,14 @@
   },
   created() {
     this.fetchAlarmContentType()
-    this.fetchData()
+    // this.fetchData()
   },
   mounted() {
     const bodyWidth = this.$refs.alarmWellRank.$el.clientWidth
     if (bodyWidth < 566) {
       this.timeButtonSize = 'small'
     }
+    this.$refs.timeButtons.initTime()
   },
   methods: {
     // 获取排名列表
diff --git a/src/views/deviceManage/components/listLevelData.vue b/src/views/deviceManage/components/listLevelData.vue
new file mode 100644
index 0000000..a140aa6
--- /dev/null
+++ b/src/views/deviceManage/components/listLevelData.vue
@@ -0,0 +1,142 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          size="small"
+          :picker-options="pickerOptions"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          @change="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="24">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getWellDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'ListWellcoverData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'logtime', align: 'center' },
+        { text: '井盖状态', value: 'statusName', align: 'center' }
+      ], // 显示列
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getWellDataSingle(this.listQuery).then(response => {
+        const data = response.data.map(item => {
+          return { ...item, statusName: item.status === '1' ? '开启' : '心跳' }
+        })
+        this.list = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listPressureData.vue b/src/views/deviceManage/components/listPressureData.vue
new file mode 100644
index 0000000..3fb58a7
--- /dev/null
+++ b/src/views/deviceManage/components/listPressureData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          size="small"
+          :picker-options="pickerOptions"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          @change="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getH2SDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleH2SData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '压力(Pa)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '压力(Pa)'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getH2SDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index c501fde..ce6ce89 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -63,6 +63,8 @@
 import listHydrantData from './components/listHydrantData'
 import listWellLocaData from './components/listWellLocaData'
 import ListH2SData from './components/listH2SData'
+import listLevelData from './components/listLevelData'
+import listPressureData from './components/listPressureData'
 import SingleGasDetectorData from '@/views/deviceManage/components/listGasDetectorData'
 
 export default {
@@ -80,7 +82,9 @@
     listTubeData,
     listWellcoverData,
     listWellLocaData,
-    listHydrantData
+    listHydrantData,
+    listPressureData,
+    listLevelData
   },
   data() {
     return {
@@ -112,7 +116,9 @@
         '10': 'list-liquid-gas-data',
         '11': 'list-hydrant-data',
         '12': 'list-tube-data',
+        '13': 'list-level-data',
         '14': 'list-h2-s-data',
+        '31': 'list-pressure-data',
         '101': 'single-gas-detector-data'
       } // 组件对照表
     }
@@ -124,6 +130,8 @@
       this.deviceForm = row
       // 展示相对应的设备列表组件
       this.cmpName = this.compDict[row.deviceType]
+      console.log(row.deviceType, 'row.deviceType')
+      console.log(this.cmpName, 'this.cmpName')
       setTimeout(() => {
         this.$refs.dataDetail.init()
       }, 100)
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 8061ca5..70db7e0 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -28,10 +28,12 @@
           <el-button slot="trigger" size="small" class="edit_btn">
             批量导入
           </el-button>
+          <download-template v-if="hasPerm('/nbdevice/batchImport')" :filename="filename" />
         </el-upload>
         <el-button v-if="hasPerm('/device/simManage/add')" size="small" class="edit_btn" @click="add">
           新增
         </el-button>
+
         <!-- <el-button v-if="hasPerm('/device/simManage/batchExport')" :disabled="total===0" size="small" @click="batchExport">
           导出记录
         </el-button> -->
@@ -56,10 +58,10 @@
 <script>
 import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
-
+import DownloadTemplate from '@/components/DownloadTemplate/index'
 export default {
   name: 'DeviceImei',
-  components: { editDevice },
+  components: { editDevice, DownloadTemplate },
   data() {
     return {
       listQuery: {
@@ -69,6 +71,7 @@
         sort: 'id',
         order: 'asc'
       }, // 查询条件
+      filename: 'sim_template.xlsx',
       columns: [
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: 'IMEI', value: 'imei', align: 'center' },

diff --git a/public/config/project.config.json b/public/config/project.config.json
index be63190..d323919 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://192.168.75.39:11308/",
+  "baseUrl": "http://111.198.10.15:11638/",
   "wsUrl": "ws://11.100.6.182:5001/websocket/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index c203b5d..5a032ad 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -103,7 +103,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: '0'
+      valueModel: ''
     }
   },
   computed: {
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..caa1a02 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -47,13 +47,14 @@
   },
   created() {
     this.fetchAlarmContentType()
-    this.fetchData()
+    // this.fetchData()
   },
   mounted() {
     const bodyWidth = this.$refs.alarmWellRank.$el.clientWidth
     if (bodyWidth < 566) {
       this.timeButtonSize = 'small'
     }
+    this.$refs.timeButtons.initTime()
   },
   methods: {
     // 获取排名列表
diff --git a/src/views/deviceManage/components/listLevelData.vue b/src/views/deviceManage/components/listLevelData.vue
new file mode 100644
index 0000000..a140aa6
--- /dev/null
+++ b/src/views/deviceManage/components/listLevelData.vue
@@ -0,0 +1,142 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          size="small"
+          :picker-options="pickerOptions"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          @change="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="24">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getWellDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'ListWellcoverData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'logtime', align: 'center' },
+        { text: '井盖状态', value: 'statusName', align: 'center' }
+      ], // 显示列
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getWellDataSingle(this.listQuery).then(response => {
+        const data = response.data.map(item => {
+          return { ...item, statusName: item.status === '1' ? '开启' : '心跳' }
+        })
+        this.list = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listPressureData.vue b/src/views/deviceManage/components/listPressureData.vue
new file mode 100644
index 0000000..3fb58a7
--- /dev/null
+++ b/src/views/deviceManage/components/listPressureData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          size="small"
+          :picker-options="pickerOptions"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          @change="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getH2SDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleH2SData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '压力(Pa)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '压力(Pa)'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getH2SDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index c501fde..ce6ce89 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -63,6 +63,8 @@
 import listHydrantData from './components/listHydrantData'
 import listWellLocaData from './components/listWellLocaData'
 import ListH2SData from './components/listH2SData'
+import listLevelData from './components/listLevelData'
+import listPressureData from './components/listPressureData'
 import SingleGasDetectorData from '@/views/deviceManage/components/listGasDetectorData'
 
 export default {
@@ -80,7 +82,9 @@
     listTubeData,
     listWellcoverData,
     listWellLocaData,
-    listHydrantData
+    listHydrantData,
+    listPressureData,
+    listLevelData
   },
   data() {
     return {
@@ -112,7 +116,9 @@
         '10': 'list-liquid-gas-data',
         '11': 'list-hydrant-data',
         '12': 'list-tube-data',
+        '13': 'list-level-data',
         '14': 'list-h2-s-data',
+        '31': 'list-pressure-data',
         '101': 'single-gas-detector-data'
       } // 组件对照表
     }
@@ -124,6 +130,8 @@
       this.deviceForm = row
       // 展示相对应的设备列表组件
       this.cmpName = this.compDict[row.deviceType]
+      console.log(row.deviceType, 'row.deviceType')
+      console.log(this.cmpName, 'this.cmpName')
       setTimeout(() => {
         this.$refs.dataDetail.init()
       }, 100)
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 8061ca5..70db7e0 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -28,10 +28,12 @@
           <el-button slot="trigger" size="small" class="edit_btn">
             批量导入
           </el-button>
+          <download-template v-if="hasPerm('/nbdevice/batchImport')" :filename="filename" />
         </el-upload>
         <el-button v-if="hasPerm('/device/simManage/add')" size="small" class="edit_btn" @click="add">
           新增
         </el-button>
+
         <!-- <el-button v-if="hasPerm('/device/simManage/batchExport')" :disabled="total===0" size="small" @click="batchExport">
           导出记录
         </el-button> -->
@@ -56,10 +58,10 @@
 <script>
 import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
-
+import DownloadTemplate from '@/components/DownloadTemplate/index'
 export default {
   name: 'DeviceImei',
-  components: { editDevice },
+  components: { editDevice, DownloadTemplate },
   data() {
     return {
       listQuery: {
@@ -69,6 +71,7 @@
         sort: 'id',
         order: 'asc'
       }, // 查询条件
+      filename: 'sim_template.xlsx',
       columns: [
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: 'IMEI', value: 'imei', align: 'center' },
diff --git a/src/views/deviceStatics/components/deviceCountByOffline.vue b/src/views/deviceStatics/components/deviceCountByOffline.vue
index 44c02f9..a71765b 100644
--- a/src/views/deviceStatics/components/deviceCountByOffline.vue
+++ b/src/views/deviceStatics/components/deviceCountByOffline.vue
@@ -5,7 +5,7 @@
         <el-card shadow="never">
           <div class="count-card">
             <span class="card-title">离线设备</span>
-            <span class="card-value">{{ total }}</span>
+            <span class="card-value">{{ offline }}</span>
             <span class="card-unit">个</span>
           </div>
         </el-card>
@@ -145,6 +145,7 @@
       }, // 查询条件
       list: [], // 返回列表
       total: 0, // 离线设备总数
+      offline: 0, // 离线设备总数
       listLoading: false,
       deviceTypeList: [], // 设备类型列表
       columns: [
@@ -165,9 +166,12 @@
       getOfflineDeviceList(this.listQuery).then(response => {
         this.tableOption.total = response.data.total
         this.total = response.data.total
-        this.list = response.data.rows
+        this.list = response.data.rows || []
         this.listLoading = false
       }).catch(_ => { this.listLoading = false })
+      deviceStaticByStatus().then(res => {
+        this.offline = res.data.offline
+      })
     },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {

diff --git a/public/config/project.config.json b/public/config/project.config.json
index be63190..d323919 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://192.168.75.39:11308/",
+  "baseUrl": "http://111.198.10.15:11638/",
   "wsUrl": "ws://11.100.6.182:5001/websocket/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index c203b5d..5a032ad 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -103,7 +103,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: '0'
+      valueModel: ''
     }
   },
   computed: {
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..caa1a02 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -47,13 +47,14 @@
   },
   created() {
     this.fetchAlarmContentType()
-    this.fetchData()
+    // this.fetchData()
   },
   mounted() {
     const bodyWidth = this.$refs.alarmWellRank.$el.clientWidth
     if (bodyWidth < 566) {
       this.timeButtonSize = 'small'
     }
+    this.$refs.timeButtons.initTime()
   },
   methods: {
     // 获取排名列表
diff --git a/src/views/deviceManage/components/listLevelData.vue b/src/views/deviceManage/components/listLevelData.vue
new file mode 100644
index 0000000..a140aa6
--- /dev/null
+++ b/src/views/deviceManage/components/listLevelData.vue
@@ -0,0 +1,142 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          size="small"
+          :picker-options="pickerOptions"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          @change="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="24">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getWellDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'ListWellcoverData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'logtime', align: 'center' },
+        { text: '井盖状态', value: 'statusName', align: 'center' }
+      ], // 显示列
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getWellDataSingle(this.listQuery).then(response => {
+        const data = response.data.map(item => {
+          return { ...item, statusName: item.status === '1' ? '开启' : '心跳' }
+        })
+        this.list = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listPressureData.vue b/src/views/deviceManage/components/listPressureData.vue
new file mode 100644
index 0000000..3fb58a7
--- /dev/null
+++ b/src/views/deviceManage/components/listPressureData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          size="small"
+          :picker-options="pickerOptions"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          @change="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getH2SDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleH2SData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '压力(Pa)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '压力(Pa)'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getH2SDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index c501fde..ce6ce89 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -63,6 +63,8 @@
 import listHydrantData from './components/listHydrantData'
 import listWellLocaData from './components/listWellLocaData'
 import ListH2SData from './components/listH2SData'
+import listLevelData from './components/listLevelData'
+import listPressureData from './components/listPressureData'
 import SingleGasDetectorData from '@/views/deviceManage/components/listGasDetectorData'
 
 export default {
@@ -80,7 +82,9 @@
     listTubeData,
     listWellcoverData,
     listWellLocaData,
-    listHydrantData
+    listHydrantData,
+    listPressureData,
+    listLevelData
   },
   data() {
     return {
@@ -112,7 +116,9 @@
         '10': 'list-liquid-gas-data',
         '11': 'list-hydrant-data',
         '12': 'list-tube-data',
+        '13': 'list-level-data',
         '14': 'list-h2-s-data',
+        '31': 'list-pressure-data',
         '101': 'single-gas-detector-data'
       } // 组件对照表
     }
@@ -124,6 +130,8 @@
       this.deviceForm = row
       // 展示相对应的设备列表组件
       this.cmpName = this.compDict[row.deviceType]
+      console.log(row.deviceType, 'row.deviceType')
+      console.log(this.cmpName, 'this.cmpName')
       setTimeout(() => {
         this.$refs.dataDetail.init()
       }, 100)
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 8061ca5..70db7e0 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -28,10 +28,12 @@
           <el-button slot="trigger" size="small" class="edit_btn">
             批量导入
           </el-button>
+          <download-template v-if="hasPerm('/nbdevice/batchImport')" :filename="filename" />
         </el-upload>
         <el-button v-if="hasPerm('/device/simManage/add')" size="small" class="edit_btn" @click="add">
           新增
         </el-button>
+
         <!-- <el-button v-if="hasPerm('/device/simManage/batchExport')" :disabled="total===0" size="small" @click="batchExport">
           导出记录
         </el-button> -->
@@ -56,10 +58,10 @@
 <script>
 import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
-
+import DownloadTemplate from '@/components/DownloadTemplate/index'
 export default {
   name: 'DeviceImei',
-  components: { editDevice },
+  components: { editDevice, DownloadTemplate },
   data() {
     return {
       listQuery: {
@@ -69,6 +71,7 @@
         sort: 'id',
         order: 'asc'
       }, // 查询条件
+      filename: 'sim_template.xlsx',
       columns: [
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: 'IMEI', value: 'imei', align: 'center' },
diff --git a/src/views/deviceStatics/components/deviceCountByOffline.vue b/src/views/deviceStatics/components/deviceCountByOffline.vue
index 44c02f9..a71765b 100644
--- a/src/views/deviceStatics/components/deviceCountByOffline.vue
+++ b/src/views/deviceStatics/components/deviceCountByOffline.vue
@@ -5,7 +5,7 @@
         <el-card shadow="never">
           <div class="count-card">
             <span class="card-title">离线设备</span>
-            <span class="card-value">{{ total }}</span>
+            <span class="card-value">{{ offline }}</span>
             <span class="card-unit">个</span>
           </div>
         </el-card>
@@ -145,6 +145,7 @@
       }, // 查询条件
       list: [], // 返回列表
       total: 0, // 离线设备总数
+      offline: 0, // 离线设备总数
       listLoading: false,
       deviceTypeList: [], // 设备类型列表
       columns: [
@@ -165,9 +166,12 @@
       getOfflineDeviceList(this.listQuery).then(response => {
         this.tableOption.total = response.data.total
         this.total = response.data.total
-        this.list = response.data.rows
+        this.list = response.data.rows || []
         this.listLoading = false
       }).catch(_ => { this.listLoading = false })
+      deviceStaticByStatus().then(res => {
+        this.offline = res.data.offline
+      })
     },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
diff --git a/src/views/deviceStatics/components/deviceCountByType.vue b/src/views/deviceStatics/components/deviceCountByType.vue
index cdba870..b2023ce 100644
--- a/src/views/deviceStatics/components/deviceCountByType.vue
+++ b/src/views/deviceStatics/components/deviceCountByType.vue
@@ -39,7 +39,7 @@
     // 获取各类型设备数量
     fetchDeviceType() {
       deviceStaticsByType().then(response => {
-        this.chartData.rows = response.data
+        // this.chartData.rows = response.data || []
       })
     },
     // 获取全部设备数量， 离线设备数量

diff --git a/public/config/project.config.json b/public/config/project.config.json
index be63190..d323919 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://192.168.75.39:11308/",
+  "baseUrl": "http://111.198.10.15:11638/",
   "wsUrl": "ws://11.100.6.182:5001/websocket/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index c203b5d..5a032ad 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -103,7 +103,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: '0'
+      valueModel: ''
     }
   },
   computed: {
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..caa1a02 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -47,13 +47,14 @@
   },
   created() {
     this.fetchAlarmContentType()
-    this.fetchData()
+    // this.fetchData()
   },
   mounted() {
     const bodyWidth = this.$refs.alarmWellRank.$el.clientWidth
     if (bodyWidth < 566) {
       this.timeButtonSize = 'small'
     }
+    this.$refs.timeButtons.initTime()
   },
   methods: {
     // 获取排名列表
diff --git a/src/views/deviceManage/components/listLevelData.vue b/src/views/deviceManage/components/listLevelData.vue
new file mode 100644
index 0000000..a140aa6
--- /dev/null
+++ b/src/views/deviceManage/components/listLevelData.vue
@@ -0,0 +1,142 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          size="small"
+          :picker-options="pickerOptions"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          @change="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="24">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getWellDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'ListWellcoverData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'logtime', align: 'center' },
+        { text: '井盖状态', value: 'statusName', align: 'center' }
+      ], // 显示列
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getWellDataSingle(this.listQuery).then(response => {
+        const data = response.data.map(item => {
+          return { ...item, statusName: item.status === '1' ? '开启' : '心跳' }
+        })
+        this.list = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listPressureData.vue b/src/views/deviceManage/components/listPressureData.vue
new file mode 100644
index 0000000..3fb58a7
--- /dev/null
+++ b/src/views/deviceManage/components/listPressureData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          size="small"
+          :picker-options="pickerOptions"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          @change="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getH2SDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleH2SData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '压力(Pa)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '压力(Pa)'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getH2SDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index c501fde..ce6ce89 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -63,6 +63,8 @@
 import listHydrantData from './components/listHydrantData'
 import listWellLocaData from './components/listWellLocaData'
 import ListH2SData from './components/listH2SData'
+import listLevelData from './components/listLevelData'
+import listPressureData from './components/listPressureData'
 import SingleGasDetectorData from '@/views/deviceManage/components/listGasDetectorData'
 
 export default {
@@ -80,7 +82,9 @@
     listTubeData,
     listWellcoverData,
     listWellLocaData,
-    listHydrantData
+    listHydrantData,
+    listPressureData,
+    listLevelData
   },
   data() {
     return {
@@ -112,7 +116,9 @@
         '10': 'list-liquid-gas-data',
         '11': 'list-hydrant-data',
         '12': 'list-tube-data',
+        '13': 'list-level-data',
         '14': 'list-h2-s-data',
+        '31': 'list-pressure-data',
         '101': 'single-gas-detector-data'
       } // 组件对照表
     }
@@ -124,6 +130,8 @@
       this.deviceForm = row
       // 展示相对应的设备列表组件
       this.cmpName = this.compDict[row.deviceType]
+      console.log(row.deviceType, 'row.deviceType')
+      console.log(this.cmpName, 'this.cmpName')
       setTimeout(() => {
         this.$refs.dataDetail.init()
       }, 100)
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 8061ca5..70db7e0 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -28,10 +28,12 @@
           <el-button slot="trigger" size="small" class="edit_btn">
             批量导入
           </el-button>
+          <download-template v-if="hasPerm('/nbdevice/batchImport')" :filename="filename" />
         </el-upload>
         <el-button v-if="hasPerm('/device/simManage/add')" size="small" class="edit_btn" @click="add">
           新增
         </el-button>
+
         <!-- <el-button v-if="hasPerm('/device/simManage/batchExport')" :disabled="total===0" size="small" @click="batchExport">
           导出记录
         </el-button> -->
@@ -56,10 +58,10 @@
 <script>
 import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
-
+import DownloadTemplate from '@/components/DownloadTemplate/index'
 export default {
   name: 'DeviceImei',
-  components: { editDevice },
+  components: { editDevice, DownloadTemplate },
   data() {
     return {
       listQuery: {
@@ -69,6 +71,7 @@
         sort: 'id',
         order: 'asc'
       }, // 查询条件
+      filename: 'sim_template.xlsx',
       columns: [
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: 'IMEI', value: 'imei', align: 'center' },
diff --git a/src/views/deviceStatics/components/deviceCountByOffline.vue b/src/views/deviceStatics/components/deviceCountByOffline.vue
index 44c02f9..a71765b 100644
--- a/src/views/deviceStatics/components/deviceCountByOffline.vue
+++ b/src/views/deviceStatics/components/deviceCountByOffline.vue
@@ -5,7 +5,7 @@
         <el-card shadow="never">
           <div class="count-card">
             <span class="card-title">离线设备</span>
-            <span class="card-value">{{ total }}</span>
+            <span class="card-value">{{ offline }}</span>
             <span class="card-unit">个</span>
           </div>
         </el-card>
@@ -145,6 +145,7 @@
       }, // 查询条件
       list: [], // 返回列表
       total: 0, // 离线设备总数
+      offline: 0, // 离线设备总数
       listLoading: false,
       deviceTypeList: [], // 设备类型列表
       columns: [
@@ -165,9 +166,12 @@
       getOfflineDeviceList(this.listQuery).then(response => {
         this.tableOption.total = response.data.total
         this.total = response.data.total
-        this.list = response.data.rows
+        this.list = response.data.rows || []
         this.listLoading = false
       }).catch(_ => { this.listLoading = false })
+      deviceStaticByStatus().then(res => {
+        this.offline = res.data.offline
+      })
     },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
diff --git a/src/views/deviceStatics/components/deviceCountByType.vue b/src/views/deviceStatics/components/deviceCountByType.vue
index cdba870..b2023ce 100644
--- a/src/views/deviceStatics/components/deviceCountByType.vue
+++ b/src/views/deviceStatics/components/deviceCountByType.vue
@@ -39,7 +39,7 @@
     // 获取各类型设备数量
     fetchDeviceType() {
       deviceStaticsByType().then(response => {
-        this.chartData.rows = response.data
+        // this.chartData.rows = response.data || []
       })
     },
     // 获取全部设备数量， 离线设备数量
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 786ccb8..93006d7 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -159,7 +159,7 @@
         </el-col>
       </el-row>
     </el-form>
-    <detail-map-lon-lat ref="detailMap" @getLonLat="getMapPostion" />
+    <detail-map-lon-lat ref="detailMap" @getLonLat="getMapPostion" :position="getPositin" />
   </div>
 </template>
 
@@ -299,6 +299,10 @@
     area() { // 获取街道
       return this.wellForm.area
     }
+    ,
+    getPositin() {
+     return  [this.wellForm.coordinateX || this.$store.getters.lng, this.wellForm.coordinateY || this.$store.getters.lat]
+    }
   },
   watch: {
     firstDept(val) { // 监控权属单位变化
@@ -324,6 +328,7 @@
   methods: {
     // 地图选点后的回调
     getMapPostion(positionForm) {
+      console.log(positionForm, 'positionForm')
       // TODO: 此处获取的是高德坐标
       this.wellForm.lngGaode = positionForm.longitude
       this.wellForm.latGaode = positionForm.latitude
@@ -348,6 +353,7 @@
             this.wellForm.position = res.formattedAddress // 完整地址
             this.wellForm.qu = res.addressComponent.adcode // 区编码
             this.wellForm.road = res.addressComponent.street // 道路
+            // this.wellForm.area = res.addressComponent.towncode // 镇
           })
         })
       }
@@ -389,6 +395,18 @@
       getAreaByDept(this.wellForm.deptid).then(response => {
         if (response.code === 200) {
           const pid = response.data.area
+          convertLnglat([response.data.lng, response.data.lat]).then(lnglat => {
+          // 2.逆地址解析
+          reverseLnglat(lnglat).then(res => {
+            this.wellForm.lngGaode = response.data.lng
+            this.wellForm.latGaode = response.data.lat
+            this.wellForm.coordinateX = response.data.lng
+            this.wellForm.coordinateY = response.data.lat
+            this.wellForm.position = res.formattedAddress // 完整地址
+            this.wellForm.qu = res.addressComponent.adcode // 区编码
+            this.wellForm.road = res.addressComponent.street // 道路
+          })
+        })
           getAreaList(pid).then(response => {
             this.quList = response.data
           })

diff --git a/public/config/project.config.json b/public/config/project.config.json
index be63190..d323919 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://192.168.75.39:11308/",
+  "baseUrl": "http://111.198.10.15:11638/",
   "wsUrl": "ws://11.100.6.182:5001/websocket/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index c203b5d..5a032ad 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -103,7 +103,7 @@
       // 输入框显示值
       labelModel: '',
       // 实际请求传值
-      valueModel: '0'
+      valueModel: ''
     }
   },
   computed: {
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..caa1a02 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -47,13 +47,14 @@
   },
   created() {
     this.fetchAlarmContentType()
-    this.fetchData()
+    // this.fetchData()
   },
   mounted() {
     const bodyWidth = this.$refs.alarmWellRank.$el.clientWidth
     if (bodyWidth < 566) {
       this.timeButtonSize = 'small'
     }
+    this.$refs.timeButtons.initTime()
   },
   methods: {
     // 获取排名列表
diff --git a/src/views/deviceManage/components/listLevelData.vue b/src/views/deviceManage/components/listLevelData.vue
new file mode 100644
index 0000000..a140aa6
--- /dev/null
+++ b/src/views/deviceManage/components/listLevelData.vue
@@ -0,0 +1,142 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          size="small"
+          :picker-options="pickerOptions"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          @change="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="24">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getWellDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'ListWellcoverData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'logtime', align: 'center' },
+        { text: '井盖状态', value: 'statusName', align: 'center' }
+      ], // 显示列
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getWellDataSingle(this.listQuery).then(response => {
+        const data = response.data.map(item => {
+          return { ...item, statusName: item.status === '1' ? '开启' : '心跳' }
+        })
+        this.list = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listPressureData.vue b/src/views/deviceManage/components/listPressureData.vue
new file mode 100644
index 0000000..3fb58a7
--- /dev/null
+++ b/src/views/deviceManage/components/listPressureData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          size="small"
+          :picker-options="pickerOptions"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          @change="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getH2SDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleH2SData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '压力(Pa)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '压力(Pa)'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getH2SDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index c501fde..ce6ce89 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -63,6 +63,8 @@
 import listHydrantData from './components/listHydrantData'
 import listWellLocaData from './components/listWellLocaData'
 import ListH2SData from './components/listH2SData'
+import listLevelData from './components/listLevelData'
+import listPressureData from './components/listPressureData'
 import SingleGasDetectorData from '@/views/deviceManage/components/listGasDetectorData'
 
 export default {
@@ -80,7 +82,9 @@
     listTubeData,
     listWellcoverData,
     listWellLocaData,
-    listHydrantData
+    listHydrantData,
+    listPressureData,
+    listLevelData
   },
   data() {
     return {
@@ -112,7 +116,9 @@
         '10': 'list-liquid-gas-data',
         '11': 'list-hydrant-data',
         '12': 'list-tube-data',
+        '13': 'list-level-data',
         '14': 'list-h2-s-data',
+        '31': 'list-pressure-data',
         '101': 'single-gas-detector-data'
       } // 组件对照表
     }
@@ -124,6 +130,8 @@
       this.deviceForm = row
       // 展示相对应的设备列表组件
       this.cmpName = this.compDict[row.deviceType]
+      console.log(row.deviceType, 'row.deviceType')
+      console.log(this.cmpName, 'this.cmpName')
       setTimeout(() => {
         this.$refs.dataDetail.init()
       }, 100)
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 8061ca5..70db7e0 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -28,10 +28,12 @@
           <el-button slot="trigger" size="small" class="edit_btn">
             批量导入
           </el-button>
+          <download-template v-if="hasPerm('/nbdevice/batchImport')" :filename="filename" />
         </el-upload>
         <el-button v-if="hasPerm('/device/simManage/add')" size="small" class="edit_btn" @click="add">
           新增
         </el-button>
+
         <!-- <el-button v-if="hasPerm('/device/simManage/batchExport')" :disabled="total===0" size="small" @click="batchExport">
           导出记录
         </el-button> -->
@@ -56,10 +58,10 @@
 <script>
 import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
-
+import DownloadTemplate from '@/components/DownloadTemplate/index'
 export default {
   name: 'DeviceImei',
-  components: { editDevice },
+  components: { editDevice, DownloadTemplate },
   data() {
     return {
       listQuery: {
@@ -69,6 +71,7 @@
         sort: 'id',
         order: 'asc'
       }, // 查询条件
+      filename: 'sim_template.xlsx',
       columns: [
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: 'IMEI', value: 'imei', align: 'center' },
diff --git a/src/views/deviceStatics/components/deviceCountByOffline.vue b/src/views/deviceStatics/components/deviceCountByOffline.vue
index 44c02f9..a71765b 100644
--- a/src/views/deviceStatics/components/deviceCountByOffline.vue
+++ b/src/views/deviceStatics/components/deviceCountByOffline.vue
@@ -5,7 +5,7 @@
         <el-card shadow="never">
           <div class="count-card">
             <span class="card-title">离线设备</span>
-            <span class="card-value">{{ total }}</span>
+            <span class="card-value">{{ offline }}</span>
             <span class="card-unit">个</span>
           </div>
         </el-card>
@@ -145,6 +145,7 @@
       }, // 查询条件
       list: [], // 返回列表
       total: 0, // 离线设备总数
+      offline: 0, // 离线设备总数
       listLoading: false,
       deviceTypeList: [], // 设备类型列表
       columns: [
@@ -165,9 +166,12 @@
       getOfflineDeviceList(this.listQuery).then(response => {
         this.tableOption.total = response.data.total
         this.total = response.data.total
-        this.list = response.data.rows
+        this.list = response.data.rows || []
         this.listLoading = false
       }).catch(_ => { this.listLoading = false })
+      deviceStaticByStatus().then(res => {
+        this.offline = res.data.offline
+      })
     },
     // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
     changePage(val) {
diff --git a/src/views/deviceStatics/components/deviceCountByType.vue b/src/views/deviceStatics/components/deviceCountByType.vue
index cdba870..b2023ce 100644
--- a/src/views/deviceStatics/components/deviceCountByType.vue
+++ b/src/views/deviceStatics/components/deviceCountByType.vue
@@ -39,7 +39,7 @@
     // 获取各类型设备数量
     fetchDeviceType() {
       deviceStaticsByType().then(response => {
-        this.chartData.rows = response.data
+        // this.chartData.rows = response.data || []
       })
     },
     // 获取全部设备数量， 离线设备数量
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 786ccb8..93006d7 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -159,7 +159,7 @@
         </el-col>
       </el-row>
     </el-form>
-    <detail-map-lon-lat ref="detailMap" @getLonLat="getMapPostion" />
+    <detail-map-lon-lat ref="detailMap" @getLonLat="getMapPostion" :position="getPositin" />
   </div>
 </template>
 
@@ -299,6 +299,10 @@
     area() { // 获取街道
       return this.wellForm.area
     }
+    ,
+    getPositin() {
+     return  [this.wellForm.coordinateX || this.$store.getters.lng, this.wellForm.coordinateY || this.$store.getters.lat]
+    }
   },
   watch: {
     firstDept(val) { // 监控权属单位变化
@@ -324,6 +328,7 @@
   methods: {
     // 地图选点后的回调
     getMapPostion(positionForm) {
+      console.log(positionForm, 'positionForm')
       // TODO: 此处获取的是高德坐标
       this.wellForm.lngGaode = positionForm.longitude
       this.wellForm.latGaode = positionForm.latitude
@@ -348,6 +353,7 @@
             this.wellForm.position = res.formattedAddress // 完整地址
             this.wellForm.qu = res.addressComponent.adcode // 区编码
             this.wellForm.road = res.addressComponent.street // 道路
+            // this.wellForm.area = res.addressComponent.towncode // 镇
           })
         })
       }
@@ -389,6 +395,18 @@
       getAreaByDept(this.wellForm.deptid).then(response => {
         if (response.code === 200) {
           const pid = response.data.area
+          convertLnglat([response.data.lng, response.data.lat]).then(lnglat => {
+          // 2.逆地址解析
+          reverseLnglat(lnglat).then(res => {
+            this.wellForm.lngGaode = response.data.lng
+            this.wellForm.latGaode = response.data.lat
+            this.wellForm.coordinateX = response.data.lng
+            this.wellForm.coordinateY = response.data.lat
+            this.wellForm.position = res.formattedAddress // 完整地址
+            this.wellForm.qu = res.addressComponent.adcode // 区编码
+            this.wellForm.road = res.addressComponent.street // 道路
+          })
+        })
           getAreaList(pid).then(response => {
             this.quList = response.data
           })
diff --git a/src/views/wellManage/detailMapLonLat.vue b/src/views/wellManage/detailMapLonLat.vue
index 27ea317..aa157e4 100644
--- a/src/views/wellManage/detailMapLonLat.vue
+++ b/src/views/wellManage/detailMapLonLat.vue
@@ -7,6 +7,7 @@
     <el-row>
       <el-col :span="24" class="overview-map-container">
         <a-map-container
+        v-if="dialogFormVisible"
           ref="map"
           :center="center"
           :zoom="zoom"