diff --git a/public/config/project.config.json b/public/config/project.config.json
index 1b2796d..2e9b76b 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "https://38911d91v5.zicp.fun/",
+  "baseUrl": "http://192.168.83.40:11309",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",

diff --git a/public/config/project.config.json b/public/config/project.config.json
index 1b2796d..2e9b76b 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "https://38911d91v5.zicp.fun/",
+  "baseUrl": "http://192.168.83.40:11309",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index 689b6b1..c2e7978 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -10,7 +10,14 @@
     params
   })
 }
-
+// 报警类型
+export function alarmType(params) {
+  return request({
+    url: '/sys/dict/code/alarmType',
+    method: 'get',
+    params
+  })
+}
 // 添加字典
 export function addDict(data) {
   return request({

diff --git a/public/config/project.config.json b/public/config/project.config.json
index 1b2796d..2e9b76b 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "https://38911d91v5.zicp.fun/",
+  "baseUrl": "http://192.168.83.40:11309",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index 689b6b1..c2e7978 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -10,7 +10,14 @@
     params
   })
 }
-
+// 报警类型
+export function alarmType(params) {
+  return request({
+    url: '/sys/dict/code/alarmType',
+    method: 'get',
+    params
+  })
+}
 // 添加字典
 export function addDict(data) {
   return request({
diff --git a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
index dba4aa9..8fbaa64 100644
--- a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
+++ b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
@@ -1,13 +1,164 @@
 <template>
-  <div>报警内容配置</div>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.alarmType"
+          size="small"
+          placeholder="报警类型"
+          clearable
+        >
+          <el-option
+            v-for="item in alarmTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.deviceType"
+          size="small"
+          placeholder="设备类型"
+          clearable
+        >
+          <el-option
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+     <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border>
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
+              {{ scope.row[column.value] }}
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+            <el-button type="text" @click="detail(scope.row)">
+              详情
+            </el-button>
+            <el-button type="text" @click="datalist(scope.row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+  </app-container>
 </template>
 
 <script>
+import { alarmType } from '@/api/system/dict'
 export default {
+  data() {
+    return {
+      columns: [
+        {
+          text: '报警内容',
+          value: 'id',
+          align: 'center'
+        },
+        {
+          text: '报警类型',
+          value: 'modelName',
+          align: 'center'
+        },
+        {
+          text: '双倍类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: true, // 加载动画
+      listQuery: {
+        alarmType: '',
+        deviceType: '',
+        offset: 1,
+        limit: 20
+      },
+      alarmTypeList: [],
+      deviceTypeList: []
+    }
+  },
+  mounted() {
+    this.getAlarmType()
+  },
+  methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 获取报警类型
+    getAlarmType() {
+      alarmType().then(response => {
+        console.log(response)
+      })
+    },
+    search() {}
+  }
 
 }
 </script>
 
-<style>
+<style rel="stylesheet/scss" lang="scss" scoped>
 
 </style>

diff --git a/public/config/project.config.json b/public/config/project.config.json
index 1b2796d..2e9b76b 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "https://38911d91v5.zicp.fun/",
+  "baseUrl": "http://192.168.83.40:11309",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index 689b6b1..c2e7978 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -10,7 +10,14 @@
     params
   })
 }
-
+// 报警类型
+export function alarmType(params) {
+  return request({
+    url: '/sys/dict/code/alarmType',
+    method: 'get',
+    params
+  })
+}
 // 添加字典
 export function addDict(data) {
   return request({
diff --git a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
index dba4aa9..8fbaa64 100644
--- a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
+++ b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
@@ -1,13 +1,164 @@
 <template>
-  <div>报警内容配置</div>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.alarmType"
+          size="small"
+          placeholder="报警类型"
+          clearable
+        >
+          <el-option
+            v-for="item in alarmTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.deviceType"
+          size="small"
+          placeholder="设备类型"
+          clearable
+        >
+          <el-option
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+     <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border>
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
+              {{ scope.row[column.value] }}
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+            <el-button type="text" @click="detail(scope.row)">
+              详情
+            </el-button>
+            <el-button type="text" @click="datalist(scope.row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+  </app-container>
 </template>
 
 <script>
+import { alarmType } from '@/api/system/dict'
 export default {
+  data() {
+    return {
+      columns: [
+        {
+          text: '报警内容',
+          value: 'id',
+          align: 'center'
+        },
+        {
+          text: '报警类型',
+          value: 'modelName',
+          align: 'center'
+        },
+        {
+          text: '双倍类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: true, // 加载动画
+      listQuery: {
+        alarmType: '',
+        deviceType: '',
+        offset: 1,
+        limit: 20
+      },
+      alarmTypeList: [],
+      deviceTypeList: []
+    }
+  },
+  mounted() {
+    this.getAlarmType()
+  },
+  methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 获取报警类型
+    getAlarmType() {
+      alarmType().then(response => {
+        console.log(response)
+      })
+    },
+    search() {}
+  }
 
 }
 </script>
 
-<style>
+<style rel="stylesheet/scss" lang="scss" scoped>
 
 </style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
index 28025d3..c7184f4 100644
--- a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
+++ b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
@@ -1,21 +1,31 @@
 <template>
   <app-container>
     <el-row>
-      <el-col :span="4">
+      <!--左半部分-->
+      <el-col :span="5">
         <div class="dept-div">
-          <el-card class="box-card" shadow="always" header="项目">
+          <el-card class="box-card" shadow="always">
             <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <div tabIndex="1">
-                燃气集团项目
-              </div>
-              <div tabIndex="2">
-                亦庄项目
-              </div>
+              <el-input
+                v-model="filterText"
+                clearable
+                placeholder="请输入项目名称"
+              />
+              <el-tree
+                ref="tree"
+                v-loading="treeLoading"
+                :filter-node-method="filterNode"
+                :data="deptTree"
+                :props="defaultProps"
+                :default-expand-all="expandAllNode"
+                :expand-on-click-node="expandNodeClick"
+                @node-click="handleNodeClick"
+              />
             </el-scrollbar>
           </el-card>
         </div>
       </el-col>
-      <el-col :span="20">
+      <el-col :span="19">
         <div>
           <el-row class="table-title">
             <el-col :span="6">
@@ -29,8 +39,16 @@
               </el-button>
             </el-col>
           </el-row>
-          <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-            <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <el-table v-loading="listLoading" :data="list" class="table" border>
+            <el-table-column :index="indexMethod" align="center" type="index" />
+            <el-table-column
+              v-for="column in columns"
+              :key="column.value"
+              :label="column.text"
+              :width="column.width"
+              :align="column.align"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
                 <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
@@ -73,43 +91,144 @@
 </template>
 
 <script>
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 export default {
   data() {
-    return {}
+    return {
+      listQuery: {
+        offset: 1,
+        limit: 20
+      }, // 查询条件
+      columns: [
+        {
+          text: '监控指标',
+          value: 'id',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'modelName',
+          align: 'center'
+        },
+        {
+          text: '开启报警',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '开启工单',
+          value: 'communNameGroup',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: true, // 加载动画
+      treeLoading: false,
+      deptTree: null,
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      filterText: '',
+      expandAllNode: true,
+      expandNodeClick: false
+    }
   },
-  methods: {}
+  watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val)
+    }
+  },
+  mounted() {
+    this.fetchDeptTree()
+  },
+  methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    filterNode(value, data) {
+      if (!value) return true
+      return data.name.indexOf(value) !== -1
+    },
+    // 获取组织结构树
+    fetchDeptTree() {
+      this.treeLoading = true
+      getDeptTreeList(this.listQuery).then(response => {
+        this.deptTree = toTreeList(response.data, '0', true)
+        this.treeLoading = false
+      })
+    },
+    // 点击左侧组织结构项触发
+    handleNodeClick(val) {
+      console.log(val)
+      this.headerValue = val.name
+      this.listQuery.deptId = val.id
+    }
+  }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+  .titleHeadStyle{
+    font-weight: 600;
+    margin: 20px 0;
+  }
+  .titleStyle{
+    margin: 20px;
+    font-weight: 600;
+  }
+  .buttonGroup{
+    margin: 20px;
+  }
   .dept-div{
     padding-right: 12px;
     .box-card{
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: 300px;
-        div{
-          text-align: center;
-          margin: 20px 0;
-          cursor: pointer;
-          padding: 10px;
-          i {
-            margin-right: 10px;
-          }
-        }
+        height: calc(100vh - 204px);
+      }
+      .el-input{
+        margin-bottom: 20px;
       }
     }
   }
-  .user-dept-scroll div:focus{
-    color: gray;
-    background: rgb(242, 238, 238);
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
   }
-  .user-dept-scroll div:hover{
-    color: gray;
-    background: rgb(242, 238, 238);
+  .pagination-container{
+    margin-bottom: 50px;
   }
-  .headerTeam{
-    font-size: 20px;
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
   }
 </style>

diff --git a/public/config/project.config.json b/public/config/project.config.json
index 1b2796d..2e9b76b 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "https://38911d91v5.zicp.fun/",
+  "baseUrl": "http://192.168.83.40:11309",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index 689b6b1..c2e7978 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -10,7 +10,14 @@
     params
   })
 }
-
+// 报警类型
+export function alarmType(params) {
+  return request({
+    url: '/sys/dict/code/alarmType',
+    method: 'get',
+    params
+  })
+}
 // 添加字典
 export function addDict(data) {
   return request({
diff --git a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
index dba4aa9..8fbaa64 100644
--- a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
+++ b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
@@ -1,13 +1,164 @@
 <template>
-  <div>报警内容配置</div>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.alarmType"
+          size="small"
+          placeholder="报警类型"
+          clearable
+        >
+          <el-option
+            v-for="item in alarmTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.deviceType"
+          size="small"
+          placeholder="设备类型"
+          clearable
+        >
+          <el-option
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+     <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border>
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
+              {{ scope.row[column.value] }}
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+            <el-button type="text" @click="detail(scope.row)">
+              详情
+            </el-button>
+            <el-button type="text" @click="datalist(scope.row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+  </app-container>
 </template>
 
 <script>
+import { alarmType } from '@/api/system/dict'
 export default {
+  data() {
+    return {
+      columns: [
+        {
+          text: '报警内容',
+          value: 'id',
+          align: 'center'
+        },
+        {
+          text: '报警类型',
+          value: 'modelName',
+          align: 'center'
+        },
+        {
+          text: '双倍类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: true, // 加载动画
+      listQuery: {
+        alarmType: '',
+        deviceType: '',
+        offset: 1,
+        limit: 20
+      },
+      alarmTypeList: [],
+      deviceTypeList: []
+    }
+  },
+  mounted() {
+    this.getAlarmType()
+  },
+  methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 获取报警类型
+    getAlarmType() {
+      alarmType().then(response => {
+        console.log(response)
+      })
+    },
+    search() {}
+  }
 
 }
 </script>
 
-<style>
+<style rel="stylesheet/scss" lang="scss" scoped>
 
 </style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
index 28025d3..c7184f4 100644
--- a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
+++ b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
@@ -1,21 +1,31 @@
 <template>
   <app-container>
     <el-row>
-      <el-col :span="4">
+      <!--左半部分-->
+      <el-col :span="5">
         <div class="dept-div">
-          <el-card class="box-card" shadow="always" header="项目">
+          <el-card class="box-card" shadow="always">
             <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <div tabIndex="1">
-                燃气集团项目
-              </div>
-              <div tabIndex="2">
-                亦庄项目
-              </div>
+              <el-input
+                v-model="filterText"
+                clearable
+                placeholder="请输入项目名称"
+              />
+              <el-tree
+                ref="tree"
+                v-loading="treeLoading"
+                :filter-node-method="filterNode"
+                :data="deptTree"
+                :props="defaultProps"
+                :default-expand-all="expandAllNode"
+                :expand-on-click-node="expandNodeClick"
+                @node-click="handleNodeClick"
+              />
             </el-scrollbar>
           </el-card>
         </div>
       </el-col>
-      <el-col :span="20">
+      <el-col :span="19">
         <div>
           <el-row class="table-title">
             <el-col :span="6">
@@ -29,8 +39,16 @@
               </el-button>
             </el-col>
           </el-row>
-          <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-            <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <el-table v-loading="listLoading" :data="list" class="table" border>
+            <el-table-column :index="indexMethod" align="center" type="index" />
+            <el-table-column
+              v-for="column in columns"
+              :key="column.value"
+              :label="column.text"
+              :width="column.width"
+              :align="column.align"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
                 <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
@@ -73,43 +91,144 @@
 </template>
 
 <script>
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 export default {
   data() {
-    return {}
+    return {
+      listQuery: {
+        offset: 1,
+        limit: 20
+      }, // 查询条件
+      columns: [
+        {
+          text: '监控指标',
+          value: 'id',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'modelName',
+          align: 'center'
+        },
+        {
+          text: '开启报警',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '开启工单',
+          value: 'communNameGroup',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: true, // 加载动画
+      treeLoading: false,
+      deptTree: null,
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      filterText: '',
+      expandAllNode: true,
+      expandNodeClick: false
+    }
   },
-  methods: {}
+  watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val)
+    }
+  },
+  mounted() {
+    this.fetchDeptTree()
+  },
+  methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    filterNode(value, data) {
+      if (!value) return true
+      return data.name.indexOf(value) !== -1
+    },
+    // 获取组织结构树
+    fetchDeptTree() {
+      this.treeLoading = true
+      getDeptTreeList(this.listQuery).then(response => {
+        this.deptTree = toTreeList(response.data, '0', true)
+        this.treeLoading = false
+      })
+    },
+    // 点击左侧组织结构项触发
+    handleNodeClick(val) {
+      console.log(val)
+      this.headerValue = val.name
+      this.listQuery.deptId = val.id
+    }
+  }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+  .titleHeadStyle{
+    font-weight: 600;
+    margin: 20px 0;
+  }
+  .titleStyle{
+    margin: 20px;
+    font-weight: 600;
+  }
+  .buttonGroup{
+    margin: 20px;
+  }
   .dept-div{
     padding-right: 12px;
     .box-card{
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: 300px;
-        div{
-          text-align: center;
-          margin: 20px 0;
-          cursor: pointer;
-          padding: 10px;
-          i {
-            margin-right: 10px;
-          }
-        }
+        height: calc(100vh - 204px);
+      }
+      .el-input{
+        margin-bottom: 20px;
       }
     }
   }
-  .user-dept-scroll div:focus{
-    color: gray;
-    background: rgb(242, 238, 238);
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
   }
-  .user-dept-scroll div:hover{
-    color: gray;
-    background: rgb(242, 238, 238);
+  .pagination-container{
+    margin-bottom: 50px;
   }
-  .headerTeam{
-    font-size: 20px;
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
   }
 </style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
index 8303dc4..543d944 100644
--- a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
@@ -1,8 +1,5 @@
 <template>
   <div>
-    <div class="heardTitle">
-      报警推送配置
-    </div>
     <el-form
       ref="dataForm"
       :rules="rules"
@@ -91,13 +88,13 @@
       </el-row>
     </el-form>
     <div>
-      <el-button size="small" @click="up">
+      <el-button size="small" @click="updata">
         修改
       </el-button>
       <el-button size="small" @click="saveData">
         保存
       </el-button>
-      <el-button size="small" @click="dialogFormVisible = false">
+      <el-button size="small" @click="dialogStatus = true">
         取消
       </el-button>
     </div>
@@ -125,6 +122,7 @@
     }
   },
   methods: {
+    updata() {},
     saveData() {}
   }
 }
@@ -136,8 +134,4 @@
 .el-row{
     margin-left: 20px;
 }
-.heardTitle{
-    margin: 10px 0;
-    font-weight: 600;
-}
 </style>

diff --git a/public/config/project.config.json b/public/config/project.config.json
index 1b2796d..2e9b76b 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "https://38911d91v5.zicp.fun/",
+  "baseUrl": "http://192.168.83.40:11309",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index 689b6b1..c2e7978 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -10,7 +10,14 @@
     params
   })
 }
-
+// 报警类型
+export function alarmType(params) {
+  return request({
+    url: '/sys/dict/code/alarmType',
+    method: 'get',
+    params
+  })
+}
 // 添加字典
 export function addDict(data) {
   return request({
diff --git a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
index dba4aa9..8fbaa64 100644
--- a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
+++ b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
@@ -1,13 +1,164 @@
 <template>
-  <div>报警内容配置</div>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.alarmType"
+          size="small"
+          placeholder="报警类型"
+          clearable
+        >
+          <el-option
+            v-for="item in alarmTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.deviceType"
+          size="small"
+          placeholder="设备类型"
+          clearable
+        >
+          <el-option
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+     <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border>
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
+              {{ scope.row[column.value] }}
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+            <el-button type="text" @click="detail(scope.row)">
+              详情
+            </el-button>
+            <el-button type="text" @click="datalist(scope.row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+  </app-container>
 </template>
 
 <script>
+import { alarmType } from '@/api/system/dict'
 export default {
+  data() {
+    return {
+      columns: [
+        {
+          text: '报警内容',
+          value: 'id',
+          align: 'center'
+        },
+        {
+          text: '报警类型',
+          value: 'modelName',
+          align: 'center'
+        },
+        {
+          text: '双倍类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: true, // 加载动画
+      listQuery: {
+        alarmType: '',
+        deviceType: '',
+        offset: 1,
+        limit: 20
+      },
+      alarmTypeList: [],
+      deviceTypeList: []
+    }
+  },
+  mounted() {
+    this.getAlarmType()
+  },
+  methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 获取报警类型
+    getAlarmType() {
+      alarmType().then(response => {
+        console.log(response)
+      })
+    },
+    search() {}
+  }
 
 }
 </script>
 
-<style>
+<style rel="stylesheet/scss" lang="scss" scoped>
 
 </style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
index 28025d3..c7184f4 100644
--- a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
+++ b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
@@ -1,21 +1,31 @@
 <template>
   <app-container>
     <el-row>
-      <el-col :span="4">
+      <!--左半部分-->
+      <el-col :span="5">
         <div class="dept-div">
-          <el-card class="box-card" shadow="always" header="项目">
+          <el-card class="box-card" shadow="always">
             <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <div tabIndex="1">
-                燃气集团项目
-              </div>
-              <div tabIndex="2">
-                亦庄项目
-              </div>
+              <el-input
+                v-model="filterText"
+                clearable
+                placeholder="请输入项目名称"
+              />
+              <el-tree
+                ref="tree"
+                v-loading="treeLoading"
+                :filter-node-method="filterNode"
+                :data="deptTree"
+                :props="defaultProps"
+                :default-expand-all="expandAllNode"
+                :expand-on-click-node="expandNodeClick"
+                @node-click="handleNodeClick"
+              />
             </el-scrollbar>
           </el-card>
         </div>
       </el-col>
-      <el-col :span="20">
+      <el-col :span="19">
         <div>
           <el-row class="table-title">
             <el-col :span="6">
@@ -29,8 +39,16 @@
               </el-button>
             </el-col>
           </el-row>
-          <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-            <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <el-table v-loading="listLoading" :data="list" class="table" border>
+            <el-table-column :index="indexMethod" align="center" type="index" />
+            <el-table-column
+              v-for="column in columns"
+              :key="column.value"
+              :label="column.text"
+              :width="column.width"
+              :align="column.align"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
                 <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
@@ -73,43 +91,144 @@
 </template>
 
 <script>
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 export default {
   data() {
-    return {}
+    return {
+      listQuery: {
+        offset: 1,
+        limit: 20
+      }, // 查询条件
+      columns: [
+        {
+          text: '监控指标',
+          value: 'id',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'modelName',
+          align: 'center'
+        },
+        {
+          text: '开启报警',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '开启工单',
+          value: 'communNameGroup',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: true, // 加载动画
+      treeLoading: false,
+      deptTree: null,
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      filterText: '',
+      expandAllNode: true,
+      expandNodeClick: false
+    }
   },
-  methods: {}
+  watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val)
+    }
+  },
+  mounted() {
+    this.fetchDeptTree()
+  },
+  methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    filterNode(value, data) {
+      if (!value) return true
+      return data.name.indexOf(value) !== -1
+    },
+    // 获取组织结构树
+    fetchDeptTree() {
+      this.treeLoading = true
+      getDeptTreeList(this.listQuery).then(response => {
+        this.deptTree = toTreeList(response.data, '0', true)
+        this.treeLoading = false
+      })
+    },
+    // 点击左侧组织结构项触发
+    handleNodeClick(val) {
+      console.log(val)
+      this.headerValue = val.name
+      this.listQuery.deptId = val.id
+    }
+  }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+  .titleHeadStyle{
+    font-weight: 600;
+    margin: 20px 0;
+  }
+  .titleStyle{
+    margin: 20px;
+    font-weight: 600;
+  }
+  .buttonGroup{
+    margin: 20px;
+  }
   .dept-div{
     padding-right: 12px;
     .box-card{
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: 300px;
-        div{
-          text-align: center;
-          margin: 20px 0;
-          cursor: pointer;
-          padding: 10px;
-          i {
-            margin-right: 10px;
-          }
-        }
+        height: calc(100vh - 204px);
+      }
+      .el-input{
+        margin-bottom: 20px;
       }
     }
   }
-  .user-dept-scroll div:focus{
-    color: gray;
-    background: rgb(242, 238, 238);
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
   }
-  .user-dept-scroll div:hover{
-    color: gray;
-    background: rgb(242, 238, 238);
+  .pagination-container{
+    margin-bottom: 50px;
   }
-  .headerTeam{
-    font-size: 20px;
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
   }
 </style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
index 8303dc4..543d944 100644
--- a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
@@ -1,8 +1,5 @@
 <template>
   <div>
-    <div class="heardTitle">
-      报警推送配置
-    </div>
     <el-form
       ref="dataForm"
       :rules="rules"
@@ -91,13 +88,13 @@
       </el-row>
     </el-form>
     <div>
-      <el-button size="small" @click="up">
+      <el-button size="small" @click="updata">
         修改
       </el-button>
       <el-button size="small" @click="saveData">
         保存
       </el-button>
-      <el-button size="small" @click="dialogFormVisible = false">
+      <el-button size="small" @click="dialogStatus = true">
         取消
       </el-button>
     </div>
@@ -125,6 +122,7 @@
     }
   },
   methods: {
+    updata() {},
     saveData() {}
   }
 }
@@ -136,8 +134,4 @@
 .el-row{
     margin-left: 20px;
 }
-.heardTitle{
-    margin: 10px 0;
-    font-weight: 600;
-}
 </style>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 7ce996e..93e9c8e 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -1,44 +1,19 @@
 <template>
   <app-container>
-    <el-row>
-      <!--左半部分-->
-      <el-col :span="4">
-        <div class="dept-div">
-          <el-card class="box-card" shadow="always">
-            <el-scrollbar class="user-dept-scroll">
-              <el-menu
-                default-active="1"
-                class="el-menu-vertical-demo"
-                @select="selectMenu"
-              >
-                <el-menu-item index="1">
-                  <i class="el-icon-share" />
-                  <span slot="title">报警推送配置</span>
-                </el-menu-item>
-                <el-menu-item index="2">
-                  <i class="el-icon-upload" />
-                  <span slot="title">报警等级配置</span>
-                </el-menu-item>
-                <el-menu-item index="3">
-                  <i class="el-icon-copy-document" />
-                  <span slot="title">报警内容配置</span>
-                </el-menu-item>
-              </el-menu>
-            </el-scrollbar>
-          </el-card>
-        </div>
-      </el-col>
-      <!--右半部分-->
-      <el-col :span="20">
-        <el-card>
-          <el-scrollbar class="user-dept-scroll-content">
-            <alarm-push-condig v-if="alarmPushConShow" />
-            <alarm-leven-config v-if="alarmLevenConShow" />
-            <alarm-content-config v-if="alarmContentConShow" />
-          </el-scrollbar>
-        </el-card>
-      </el-col>
-    </el-row>
+    <el-tabs tab-position="left" class="user-dept-scroll">
+      <el-tab-pane>
+        <span slot="label"><i class="el-icon-share" />报警推送配置</span>
+        <alarm-push-condig />
+      </el-tab-pane>
+      <el-tab-pane>
+        <span slot="label"><i class="el-icon-upload" />报警等级配置</span>
+        <alarm-leven-config />
+      </el-tab-pane>
+      <el-tab-pane>
+        <span slot="label"><i class="el-icon-copy-document" />报警内容配置</span>
+        <alarm-content-config />
+      </el-tab-pane>
+    </el-tabs>
   </app-container>
 </template>
 
@@ -52,62 +27,18 @@
   components: { alarmPushCondig, alarmLevenConfig, alarmContentConfig },
   data() {
     return {
-      alarmPushConShow: true,
-      alarmLevenConShow: false,
-      alarmContentConShow: false
     }
   },
   mounted() {
   },
   methods: {
-    selectMenu(val) {
-      console.log(val)
-      if (val === '1') {
-        this.alarmPushConShow = true
-        this.alarmLevenConShow = false
-        this.alarmContentConShow = false
-      } else if (val === '2') {
-        this.alarmPushConShow = false
-        this.alarmLevenConShow = true
-        this.alarmContentConShow = false
-      } else if (val === '3') {
-        this.alarmPushConShow = false
-        this.alarmLevenConShow = false
-        this.alarmContentConShow = true
-      }
-    }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .dept-div{
-    padding-right: 12px;
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 640px);
-        div{
-          text-align: center;
-          margin: 20px 0;
-          cursor: pointer;
-          padding: 10px;
-          i {
-            margin-right: 10px;
-          }
-        }
-      }
-    }
-  }
-  .user-dept-scroll-content{
-    height: calc(100vh - 200px);
-  }
-</style>
-<style>
-  .dept-div .el-scrollbar__wrap{
-    overflow-x: auto;
-    background-color: #fff;
-    padding: 0px;
+  .user-dept-scroll{
+    width: 100%;
+    height: calc(100vh - 160px);
   }
 </style>

diff --git a/public/config/project.config.json b/public/config/project.config.json
index 1b2796d..2e9b76b 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "https://38911d91v5.zicp.fun/",
+  "baseUrl": "http://192.168.83.40:11309",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index 689b6b1..c2e7978 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -10,7 +10,14 @@
     params
   })
 }
-
+// 报警类型
+export function alarmType(params) {
+  return request({
+    url: '/sys/dict/code/alarmType',
+    method: 'get',
+    params
+  })
+}
 // 添加字典
 export function addDict(data) {
   return request({
diff --git a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
index dba4aa9..8fbaa64 100644
--- a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
+++ b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
@@ -1,13 +1,164 @@
 <template>
-  <div>报警内容配置</div>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.alarmType"
+          size="small"
+          placeholder="报警类型"
+          clearable
+        >
+          <el-option
+            v-for="item in alarmTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.deviceType"
+          size="small"
+          placeholder="设备类型"
+          clearable
+        >
+          <el-option
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+     <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border>
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
+              {{ scope.row[column.value] }}
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+            <el-button type="text" @click="detail(scope.row)">
+              详情
+            </el-button>
+            <el-button type="text" @click="datalist(scope.row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+  </app-container>
 </template>
 
 <script>
+import { alarmType } from '@/api/system/dict'
 export default {
+  data() {
+    return {
+      columns: [
+        {
+          text: '报警内容',
+          value: 'id',
+          align: 'center'
+        },
+        {
+          text: '报警类型',
+          value: 'modelName',
+          align: 'center'
+        },
+        {
+          text: '双倍类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: true, // 加载动画
+      listQuery: {
+        alarmType: '',
+        deviceType: '',
+        offset: 1,
+        limit: 20
+      },
+      alarmTypeList: [],
+      deviceTypeList: []
+    }
+  },
+  mounted() {
+    this.getAlarmType()
+  },
+  methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 获取报警类型
+    getAlarmType() {
+      alarmType().then(response => {
+        console.log(response)
+      })
+    },
+    search() {}
+  }
 
 }
 </script>
 
-<style>
+<style rel="stylesheet/scss" lang="scss" scoped>
 
 </style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
index 28025d3..c7184f4 100644
--- a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
+++ b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
@@ -1,21 +1,31 @@
 <template>
   <app-container>
     <el-row>
-      <el-col :span="4">
+      <!--左半部分-->
+      <el-col :span="5">
         <div class="dept-div">
-          <el-card class="box-card" shadow="always" header="项目">
+          <el-card class="box-card" shadow="always">
             <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <div tabIndex="1">
-                燃气集团项目
-              </div>
-              <div tabIndex="2">
-                亦庄项目
-              </div>
+              <el-input
+                v-model="filterText"
+                clearable
+                placeholder="请输入项目名称"
+              />
+              <el-tree
+                ref="tree"
+                v-loading="treeLoading"
+                :filter-node-method="filterNode"
+                :data="deptTree"
+                :props="defaultProps"
+                :default-expand-all="expandAllNode"
+                :expand-on-click-node="expandNodeClick"
+                @node-click="handleNodeClick"
+              />
             </el-scrollbar>
           </el-card>
         </div>
       </el-col>
-      <el-col :span="20">
+      <el-col :span="19">
         <div>
           <el-row class="table-title">
             <el-col :span="6">
@@ -29,8 +39,16 @@
               </el-button>
             </el-col>
           </el-row>
-          <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-            <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <el-table v-loading="listLoading" :data="list" class="table" border>
+            <el-table-column :index="indexMethod" align="center" type="index" />
+            <el-table-column
+              v-for="column in columns"
+              :key="column.value"
+              :label="column.text"
+              :width="column.width"
+              :align="column.align"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
                 <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
@@ -73,43 +91,144 @@
 </template>
 
 <script>
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 export default {
   data() {
-    return {}
+    return {
+      listQuery: {
+        offset: 1,
+        limit: 20
+      }, // 查询条件
+      columns: [
+        {
+          text: '监控指标',
+          value: 'id',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'modelName',
+          align: 'center'
+        },
+        {
+          text: '开启报警',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '开启工单',
+          value: 'communNameGroup',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: true, // 加载动画
+      treeLoading: false,
+      deptTree: null,
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      filterText: '',
+      expandAllNode: true,
+      expandNodeClick: false
+    }
   },
-  methods: {}
+  watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val)
+    }
+  },
+  mounted() {
+    this.fetchDeptTree()
+  },
+  methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    filterNode(value, data) {
+      if (!value) return true
+      return data.name.indexOf(value) !== -1
+    },
+    // 获取组织结构树
+    fetchDeptTree() {
+      this.treeLoading = true
+      getDeptTreeList(this.listQuery).then(response => {
+        this.deptTree = toTreeList(response.data, '0', true)
+        this.treeLoading = false
+      })
+    },
+    // 点击左侧组织结构项触发
+    handleNodeClick(val) {
+      console.log(val)
+      this.headerValue = val.name
+      this.listQuery.deptId = val.id
+    }
+  }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+  .titleHeadStyle{
+    font-weight: 600;
+    margin: 20px 0;
+  }
+  .titleStyle{
+    margin: 20px;
+    font-weight: 600;
+  }
+  .buttonGroup{
+    margin: 20px;
+  }
   .dept-div{
     padding-right: 12px;
     .box-card{
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: 300px;
-        div{
-          text-align: center;
-          margin: 20px 0;
-          cursor: pointer;
-          padding: 10px;
-          i {
-            margin-right: 10px;
-          }
-        }
+        height: calc(100vh - 204px);
+      }
+      .el-input{
+        margin-bottom: 20px;
       }
     }
   }
-  .user-dept-scroll div:focus{
-    color: gray;
-    background: rgb(242, 238, 238);
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
   }
-  .user-dept-scroll div:hover{
-    color: gray;
-    background: rgb(242, 238, 238);
+  .pagination-container{
+    margin-bottom: 50px;
   }
-  .headerTeam{
-    font-size: 20px;
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
   }
 </style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
index 8303dc4..543d944 100644
--- a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
@@ -1,8 +1,5 @@
 <template>
   <div>
-    <div class="heardTitle">
-      报警推送配置
-    </div>
     <el-form
       ref="dataForm"
       :rules="rules"
@@ -91,13 +88,13 @@
       </el-row>
     </el-form>
     <div>
-      <el-button size="small" @click="up">
+      <el-button size="small" @click="updata">
         修改
       </el-button>
       <el-button size="small" @click="saveData">
         保存
       </el-button>
-      <el-button size="small" @click="dialogFormVisible = false">
+      <el-button size="small" @click="dialogStatus = true">
         取消
       </el-button>
     </div>
@@ -125,6 +122,7 @@
     }
   },
   methods: {
+    updata() {},
     saveData() {}
   }
 }
@@ -136,8 +134,4 @@
 .el-row{
     margin-left: 20px;
 }
-.heardTitle{
-    margin: 10px 0;
-    font-weight: 600;
-}
 </style>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 7ce996e..93e9c8e 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -1,44 +1,19 @@
 <template>
   <app-container>
-    <el-row>
-      <!--左半部分-->
-      <el-col :span="4">
-        <div class="dept-div">
-          <el-card class="box-card" shadow="always">
-            <el-scrollbar class="user-dept-scroll">
-              <el-menu
-                default-active="1"
-                class="el-menu-vertical-demo"
-                @select="selectMenu"
-              >
-                <el-menu-item index="1">
-                  <i class="el-icon-share" />
-                  <span slot="title">报警推送配置</span>
-                </el-menu-item>
-                <el-menu-item index="2">
-                  <i class="el-icon-upload" />
-                  <span slot="title">报警等级配置</span>
-                </el-menu-item>
-                <el-menu-item index="3">
-                  <i class="el-icon-copy-document" />
-                  <span slot="title">报警内容配置</span>
-                </el-menu-item>
-              </el-menu>
-            </el-scrollbar>
-          </el-card>
-        </div>
-      </el-col>
-      <!--右半部分-->
-      <el-col :span="20">
-        <el-card>
-          <el-scrollbar class="user-dept-scroll-content">
-            <alarm-push-condig v-if="alarmPushConShow" />
-            <alarm-leven-config v-if="alarmLevenConShow" />
-            <alarm-content-config v-if="alarmContentConShow" />
-          </el-scrollbar>
-        </el-card>
-      </el-col>
-    </el-row>
+    <el-tabs tab-position="left" class="user-dept-scroll">
+      <el-tab-pane>
+        <span slot="label"><i class="el-icon-share" />报警推送配置</span>
+        <alarm-push-condig />
+      </el-tab-pane>
+      <el-tab-pane>
+        <span slot="label"><i class="el-icon-upload" />报警等级配置</span>
+        <alarm-leven-config />
+      </el-tab-pane>
+      <el-tab-pane>
+        <span slot="label"><i class="el-icon-copy-document" />报警内容配置</span>
+        <alarm-content-config />
+      </el-tab-pane>
+    </el-tabs>
   </app-container>
 </template>
 
@@ -52,62 +27,18 @@
   components: { alarmPushCondig, alarmLevenConfig, alarmContentConfig },
   data() {
     return {
-      alarmPushConShow: true,
-      alarmLevenConShow: false,
-      alarmContentConShow: false
     }
   },
   mounted() {
   },
   methods: {
-    selectMenu(val) {
-      console.log(val)
-      if (val === '1') {
-        this.alarmPushConShow = true
-        this.alarmLevenConShow = false
-        this.alarmContentConShow = false
-      } else if (val === '2') {
-        this.alarmPushConShow = false
-        this.alarmLevenConShow = true
-        this.alarmContentConShow = false
-      } else if (val === '3') {
-        this.alarmPushConShow = false
-        this.alarmLevenConShow = false
-        this.alarmContentConShow = true
-      }
-    }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .dept-div{
-    padding-right: 12px;
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 640px);
-        div{
-          text-align: center;
-          margin: 20px 0;
-          cursor: pointer;
-          padding: 10px;
-          i {
-            margin-right: 10px;
-          }
-        }
-      }
-    }
-  }
-  .user-dept-scroll-content{
-    height: calc(100vh - 200px);
-  }
-</style>
-<style>
-  .dept-div .el-scrollbar__wrap{
-    overflow-x: auto;
-    background-color: #fff;
-    padding: 0px;
+  .user-dept-scroll{
+    width: 100%;
+    height: calc(100vh - 160px);
   }
 </style>
diff --git a/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue b/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
deleted file mode 100644
index 3f32389..0000000
--- a/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
+++ /dev/null
@@ -1,302 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="通讯方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              :disabled="dialogStatus === 'detail' ? true : false"
-              placeholder="请选择支持通信方式"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="默认坐标系" prop="coordinateType">
-            <el-input
-              v-model="deviceForm.coordinateType"
-              placeholder="请输入数据默认坐标系"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="生成工单" prop="isJobGenerate">
-            <el-select
-              v-model="deviceForm.isJobGenerate"
-              clearable
-              placeholder="请选择是否生成工单"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in jobList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="APP推送" prop="isAppPush">
-            <el-select
-              v-model="deviceForm.isAppPush"
-              clearable
-              placeholder="请选择是否APP推送"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in appPushList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="平台地址" prop="address">
-            <el-input
-              v-model="deviceForm.address"
-              placeholder="请输入平台地址"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="应用名称" prop="planName">
-            <el-input
-              v-model="deviceForm.planName"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              placeholder="请输入应用名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="APPID" prop="APPID">
-            <el-input
-              v-model="deviceForm.APPID"
-              placeholder="请输入APPID"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="APPKEY" prop="APPKEY">
-            <el-input
-              v-model="deviceForm.APPKEY"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              placeholder="请输入APPKEY"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { updateAlarmContent } from '@/api/systemConfig/tenantConfig'
-export default {
-  name: 'EditTenantConfig',
-  data() {
-    return {
-      // 通讯方式
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 是否生成工单
-      jobList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      // 是否开启App推送
-      appPushList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        communication: [],
-        coordinateType: '',
-        isJobGenerate: '',
-        isAppPush: '',
-        planName: '',
-        address: '',
-        APPID: '',
-        APPKEY: ''
-      },
-      // 表单校验规则
-      rules: {
-        communication: [{ required: true, message: '支持通讯方式必选', trigger: ['blur', 'change'] }],
-        coordinateType: [{ required: true, message: '坐标系不能为空', trigger: ['blur', 'change'] }],
-        isJobGenerate: [{ required: true, message: '是否生成工单必选', trigger: ['blur', 'change'] }],
-        isAppPush: [{ required: true, message: '是否开启APP推送必选', trigger: ['blur', 'change'] }],
-        address: [{ required: true, message: '平台地址不能为空', trigger: ['blur', 'change'] }],
-        planName: [{ required: true, message: '应用名称不能为空', trigger: ['blur', 'change'] }],
-        APPID: [{ required: true, message: 'APPID不能为空', trigger: ['blur', 'change'] }],
-        APPKEY: [{ required: true, message: 'APPKEY不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        communication: [],
-        coordinateType: '',
-        isJobGenerate: '',
-        isAppPush: '',
-        planName: '',
-        address: '',
-        APPID: '',
-        APPKEY: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          communication: row.communication.split(','),
-          coordinateType: row.coordinateType,
-          isJobGenerate: row.isJobGenerate,
-          isAppPush: row.isAppPush,
-          planName: row.planName,
-          address: row.address,
-          APPID: row.address,
-          APPKEY: row.APPKEY
-        }
-      }
-    },
-    // 修改数据
-    saveData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>

diff --git a/public/config/project.config.json b/public/config/project.config.json
index 1b2796d..2e9b76b 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "https://38911d91v5.zicp.fun/",
+  "baseUrl": "http://192.168.83.40:11309",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index 689b6b1..c2e7978 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -10,7 +10,14 @@
     params
   })
 }
-
+// 报警类型
+export function alarmType(params) {
+  return request({
+    url: '/sys/dict/code/alarmType',
+    method: 'get',
+    params
+  })
+}
 // 添加字典
 export function addDict(data) {
   return request({
diff --git a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
index dba4aa9..8fbaa64 100644
--- a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
+++ b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
@@ -1,13 +1,164 @@
 <template>
-  <div>报警内容配置</div>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.alarmType"
+          size="small"
+          placeholder="报警类型"
+          clearable
+        >
+          <el-option
+            v-for="item in alarmTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.deviceType"
+          size="small"
+          placeholder="设备类型"
+          clearable
+        >
+          <el-option
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+     <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border>
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
+              {{ scope.row[column.value] }}
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+            <el-button type="text" @click="detail(scope.row)">
+              详情
+            </el-button>
+            <el-button type="text" @click="datalist(scope.row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+  </app-container>
 </template>
 
 <script>
+import { alarmType } from '@/api/system/dict'
 export default {
+  data() {
+    return {
+      columns: [
+        {
+          text: '报警内容',
+          value: 'id',
+          align: 'center'
+        },
+        {
+          text: '报警类型',
+          value: 'modelName',
+          align: 'center'
+        },
+        {
+          text: '双倍类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: true, // 加载动画
+      listQuery: {
+        alarmType: '',
+        deviceType: '',
+        offset: 1,
+        limit: 20
+      },
+      alarmTypeList: [],
+      deviceTypeList: []
+    }
+  },
+  mounted() {
+    this.getAlarmType()
+  },
+  methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 获取报警类型
+    getAlarmType() {
+      alarmType().then(response => {
+        console.log(response)
+      })
+    },
+    search() {}
+  }
 
 }
 </script>
 
-<style>
+<style rel="stylesheet/scss" lang="scss" scoped>
 
 </style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
index 28025d3..c7184f4 100644
--- a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
+++ b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
@@ -1,21 +1,31 @@
 <template>
   <app-container>
     <el-row>
-      <el-col :span="4">
+      <!--左半部分-->
+      <el-col :span="5">
         <div class="dept-div">
-          <el-card class="box-card" shadow="always" header="项目">
+          <el-card class="box-card" shadow="always">
             <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <div tabIndex="1">
-                燃气集团项目
-              </div>
-              <div tabIndex="2">
-                亦庄项目
-              </div>
+              <el-input
+                v-model="filterText"
+                clearable
+                placeholder="请输入项目名称"
+              />
+              <el-tree
+                ref="tree"
+                v-loading="treeLoading"
+                :filter-node-method="filterNode"
+                :data="deptTree"
+                :props="defaultProps"
+                :default-expand-all="expandAllNode"
+                :expand-on-click-node="expandNodeClick"
+                @node-click="handleNodeClick"
+              />
             </el-scrollbar>
           </el-card>
         </div>
       </el-col>
-      <el-col :span="20">
+      <el-col :span="19">
         <div>
           <el-row class="table-title">
             <el-col :span="6">
@@ -29,8 +39,16 @@
               </el-button>
             </el-col>
           </el-row>
-          <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-            <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <el-table v-loading="listLoading" :data="list" class="table" border>
+            <el-table-column :index="indexMethod" align="center" type="index" />
+            <el-table-column
+              v-for="column in columns"
+              :key="column.value"
+              :label="column.text"
+              :width="column.width"
+              :align="column.align"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
                 <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
@@ -73,43 +91,144 @@
 </template>
 
 <script>
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 export default {
   data() {
-    return {}
+    return {
+      listQuery: {
+        offset: 1,
+        limit: 20
+      }, // 查询条件
+      columns: [
+        {
+          text: '监控指标',
+          value: 'id',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'modelName',
+          align: 'center'
+        },
+        {
+          text: '开启报警',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '开启工单',
+          value: 'communNameGroup',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: true, // 加载动画
+      treeLoading: false,
+      deptTree: null,
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      filterText: '',
+      expandAllNode: true,
+      expandNodeClick: false
+    }
   },
-  methods: {}
+  watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val)
+    }
+  },
+  mounted() {
+    this.fetchDeptTree()
+  },
+  methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    filterNode(value, data) {
+      if (!value) return true
+      return data.name.indexOf(value) !== -1
+    },
+    // 获取组织结构树
+    fetchDeptTree() {
+      this.treeLoading = true
+      getDeptTreeList(this.listQuery).then(response => {
+        this.deptTree = toTreeList(response.data, '0', true)
+        this.treeLoading = false
+      })
+    },
+    // 点击左侧组织结构项触发
+    handleNodeClick(val) {
+      console.log(val)
+      this.headerValue = val.name
+      this.listQuery.deptId = val.id
+    }
+  }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+  .titleHeadStyle{
+    font-weight: 600;
+    margin: 20px 0;
+  }
+  .titleStyle{
+    margin: 20px;
+    font-weight: 600;
+  }
+  .buttonGroup{
+    margin: 20px;
+  }
   .dept-div{
     padding-right: 12px;
     .box-card{
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: 300px;
-        div{
-          text-align: center;
-          margin: 20px 0;
-          cursor: pointer;
-          padding: 10px;
-          i {
-            margin-right: 10px;
-          }
-        }
+        height: calc(100vh - 204px);
+      }
+      .el-input{
+        margin-bottom: 20px;
       }
     }
   }
-  .user-dept-scroll div:focus{
-    color: gray;
-    background: rgb(242, 238, 238);
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
   }
-  .user-dept-scroll div:hover{
-    color: gray;
-    background: rgb(242, 238, 238);
+  .pagination-container{
+    margin-bottom: 50px;
   }
-  .headerTeam{
-    font-size: 20px;
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
   }
 </style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
index 8303dc4..543d944 100644
--- a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
@@ -1,8 +1,5 @@
 <template>
   <div>
-    <div class="heardTitle">
-      报警推送配置
-    </div>
     <el-form
       ref="dataForm"
       :rules="rules"
@@ -91,13 +88,13 @@
       </el-row>
     </el-form>
     <div>
-      <el-button size="small" @click="up">
+      <el-button size="small" @click="updata">
         修改
       </el-button>
       <el-button size="small" @click="saveData">
         保存
       </el-button>
-      <el-button size="small" @click="dialogFormVisible = false">
+      <el-button size="small" @click="dialogStatus = true">
         取消
       </el-button>
     </div>
@@ -125,6 +122,7 @@
     }
   },
   methods: {
+    updata() {},
     saveData() {}
   }
 }
@@ -136,8 +134,4 @@
 .el-row{
     margin-left: 20px;
 }
-.heardTitle{
-    margin: 10px 0;
-    font-weight: 600;
-}
 </style>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 7ce996e..93e9c8e 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -1,44 +1,19 @@
 <template>
   <app-container>
-    <el-row>
-      <!--左半部分-->
-      <el-col :span="4">
-        <div class="dept-div">
-          <el-card class="box-card" shadow="always">
-            <el-scrollbar class="user-dept-scroll">
-              <el-menu
-                default-active="1"
-                class="el-menu-vertical-demo"
-                @select="selectMenu"
-              >
-                <el-menu-item index="1">
-                  <i class="el-icon-share" />
-                  <span slot="title">报警推送配置</span>
-                </el-menu-item>
-                <el-menu-item index="2">
-                  <i class="el-icon-upload" />
-                  <span slot="title">报警等级配置</span>
-                </el-menu-item>
-                <el-menu-item index="3">
-                  <i class="el-icon-copy-document" />
-                  <span slot="title">报警内容配置</span>
-                </el-menu-item>
-              </el-menu>
-            </el-scrollbar>
-          </el-card>
-        </div>
-      </el-col>
-      <!--右半部分-->
-      <el-col :span="20">
-        <el-card>
-          <el-scrollbar class="user-dept-scroll-content">
-            <alarm-push-condig v-if="alarmPushConShow" />
-            <alarm-leven-config v-if="alarmLevenConShow" />
-            <alarm-content-config v-if="alarmContentConShow" />
-          </el-scrollbar>
-        </el-card>
-      </el-col>
-    </el-row>
+    <el-tabs tab-position="left" class="user-dept-scroll">
+      <el-tab-pane>
+        <span slot="label"><i class="el-icon-share" />报警推送配置</span>
+        <alarm-push-condig />
+      </el-tab-pane>
+      <el-tab-pane>
+        <span slot="label"><i class="el-icon-upload" />报警等级配置</span>
+        <alarm-leven-config />
+      </el-tab-pane>
+      <el-tab-pane>
+        <span slot="label"><i class="el-icon-copy-document" />报警内容配置</span>
+        <alarm-content-config />
+      </el-tab-pane>
+    </el-tabs>
   </app-container>
 </template>
 
@@ -52,62 +27,18 @@
   components: { alarmPushCondig, alarmLevenConfig, alarmContentConfig },
   data() {
     return {
-      alarmPushConShow: true,
-      alarmLevenConShow: false,
-      alarmContentConShow: false
     }
   },
   mounted() {
   },
   methods: {
-    selectMenu(val) {
-      console.log(val)
-      if (val === '1') {
-        this.alarmPushConShow = true
-        this.alarmLevenConShow = false
-        this.alarmContentConShow = false
-      } else if (val === '2') {
-        this.alarmPushConShow = false
-        this.alarmLevenConShow = true
-        this.alarmContentConShow = false
-      } else if (val === '3') {
-        this.alarmPushConShow = false
-        this.alarmLevenConShow = false
-        this.alarmContentConShow = true
-      }
-    }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .dept-div{
-    padding-right: 12px;
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 640px);
-        div{
-          text-align: center;
-          margin: 20px 0;
-          cursor: pointer;
-          padding: 10px;
-          i {
-            margin-right: 10px;
-          }
-        }
-      }
-    }
-  }
-  .user-dept-scroll-content{
-    height: calc(100vh - 200px);
-  }
-</style>
-<style>
-  .dept-div .el-scrollbar__wrap{
-    overflow-x: auto;
-    background-color: #fff;
-    padding: 0px;
+  .user-dept-scroll{
+    width: 100%;
+    height: calc(100vh - 160px);
   }
 </style>
diff --git a/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue b/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
deleted file mode 100644
index 3f32389..0000000
--- a/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
+++ /dev/null
@@ -1,302 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="通讯方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              :disabled="dialogStatus === 'detail' ? true : false"
-              placeholder="请选择支持通信方式"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="默认坐标系" prop="coordinateType">
-            <el-input
-              v-model="deviceForm.coordinateType"
-              placeholder="请输入数据默认坐标系"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="生成工单" prop="isJobGenerate">
-            <el-select
-              v-model="deviceForm.isJobGenerate"
-              clearable
-              placeholder="请选择是否生成工单"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in jobList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="APP推送" prop="isAppPush">
-            <el-select
-              v-model="deviceForm.isAppPush"
-              clearable
-              placeholder="请选择是否APP推送"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in appPushList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="平台地址" prop="address">
-            <el-input
-              v-model="deviceForm.address"
-              placeholder="请输入平台地址"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="应用名称" prop="planName">
-            <el-input
-              v-model="deviceForm.planName"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              placeholder="请输入应用名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="APPID" prop="APPID">
-            <el-input
-              v-model="deviceForm.APPID"
-              placeholder="请输入APPID"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="APPKEY" prop="APPKEY">
-            <el-input
-              v-model="deviceForm.APPKEY"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              placeholder="请输入APPKEY"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { updateAlarmContent } from '@/api/systemConfig/tenantConfig'
-export default {
-  name: 'EditTenantConfig',
-  data() {
-    return {
-      // 通讯方式
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 是否生成工单
-      jobList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      // 是否开启App推送
-      appPushList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        communication: [],
-        coordinateType: '',
-        isJobGenerate: '',
-        isAppPush: '',
-        planName: '',
-        address: '',
-        APPID: '',
-        APPKEY: ''
-      },
-      // 表单校验规则
-      rules: {
-        communication: [{ required: true, message: '支持通讯方式必选', trigger: ['blur', 'change'] }],
-        coordinateType: [{ required: true, message: '坐标系不能为空', trigger: ['blur', 'change'] }],
-        isJobGenerate: [{ required: true, message: '是否生成工单必选', trigger: ['blur', 'change'] }],
-        isAppPush: [{ required: true, message: '是否开启APP推送必选', trigger: ['blur', 'change'] }],
-        address: [{ required: true, message: '平台地址不能为空', trigger: ['blur', 'change'] }],
-        planName: [{ required: true, message: '应用名称不能为空', trigger: ['blur', 'change'] }],
-        APPID: [{ required: true, message: 'APPID不能为空', trigger: ['blur', 'change'] }],
-        APPKEY: [{ required: true, message: 'APPKEY不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        communication: [],
-        coordinateType: '',
-        isJobGenerate: '',
-        isAppPush: '',
-        planName: '',
-        address: '',
-        APPID: '',
-        APPKEY: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          communication: row.communication.split(','),
-          coordinateType: row.coordinateType,
-          isJobGenerate: row.isJobGenerate,
-          isAppPush: row.isAppPush,
-          planName: row.planName,
-          address: row.address,
-          APPID: row.address,
-          APPKEY: row.APPKEY
-        }
-      }
-    },
-    // 修改数据
-    saveData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/systemConfig/tenantConfig/tenantConfig.vue b/src/views/systemConfig/tenantConfig/tenantConfig.vue
index 021f45f..898bf74 100644
--- a/src/views/systemConfig/tenantConfig/tenantConfig.vue
+++ b/src/views/systemConfig/tenantConfig/tenantConfig.vue
@@ -5,13 +5,16 @@
       <el-col :span="5">
         <div class="dept-div">
           <el-card class="box-card" shadow="always">
-            <div slot="header">
-              <span>项目名称</span>
-            </div>
             <el-scrollbar ref="deptScroll" class="user-dept-scroll">
+              <el-input
+                v-model="filterText"
+                clearable
+                placeholder="请输入项目名称"
+              />
               <el-tree
-                ref="tree2"
+                ref="tree"
                 v-loading="treeLoading"
+                :filter-node-method="filterNode"
                 :data="deptTree"
                 :props="defaultProps"
                 :default-expand-all="expandAllNode"
@@ -24,103 +27,208 @@
       </el-col>
       <!--右半部分-->
       <el-col :span="19">
-        <!--筛选条件-->
-        <search-area size="small" @search="search">
-          <search-item>
-            <el-input
-              v-model="listQuery.tenantName"
-              size="small"
-              clearable
-              placeholder="请输入项目名称"
-            />
-          </search-item>
-        </search-area>
-        <el-row class="table-title">
-          <el-col :span="6">
-            <div class="title-header">
-              <i class="el-icon-menu" />{{ headerValue }}
-            </div>
-          </el-col>
-          <el-col :span="12" :offset="6" class="edit_btns">
-            <el-button
-              class="edit_btn"
-              size="small"
-              @click="add"
-            >
-              新增
-            </el-button>
-          </el-col>
-        </el-row>
-        <el-table :data="list">
-          <el-table-column label="通讯协议" align="center" />
-          <el-table-column label="默认坐标系" align="center" />
-          <el-table-column label="经度" align="center" />
-          <el-table-column label="维度" align="center" />
-          <el-table-column label="生成工单" align="center" />
-          <el-table-column label="APP推送" align="center" />
-          <el-table-column label="NB平台配置" align="center">
-            <el-table-column label="平台地址" align="center" />
-            <el-table-column label="应用名称" align="center" />
-            <el-table-column label="APPID" align="center" />
-            <el-table-column label="APPKEY" align="center" />
-          </el-table-column>
-          <el-table-column label="操作" align="center">
-            <template slot-scope="scope">
-              <el-button type="text" @click="edit(scope.row)">
-                编辑
-              </el-button>
-              <el-button type="text" @click="detail(scope.row)">
-                详情
-              </el-button>
-              <el-button type="text" @click="del(scope.row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+        <el-form
+          ref="dataForm"
+          :rules="rules"
+          :model="listQuery"
+          label-well-code="right"
+          label-width="100px"
+        >
+          <div class="titleHeadStyle">
+            <div>{{ headerValue }}</div>
+          </div>
+          <div class="titleStyle">
+            基础配置
+          </div>
+          <el-row :gutter="10">
+            <el-col :span="20">
+              <el-col :span="10">
+                <el-form-item label="经度" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入经度"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="纬度" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入纬度"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="20">
+              <el-col :span="10">
+                <el-form-item label="生产工单" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请选择是否生产工单"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="APP推送" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请选择是否是否APP推送"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="20">
+              <el-col :span="10">
+                <el-form-item label="通讯协议" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入通讯协议"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="默认坐标系" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入默认坐标系"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-col>
+          </el-row>
+          <div class="titleStyle">
+            NB平台配置
+          </div>
+          <el-row :gutter="10">
+            <el-col :span="20">
+              <el-col :span="10">
+                <el-form-item label="APPID" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入APPID"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="APPKEY" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入APPKEY"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="20">
+              <el-col :span="10">
+                <el-form-item label="平台地址" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入平台地址"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="应用名称" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入应用名称"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div class="buttonGroup">
+          <el-button size="small" @click="saveData">
+            保存
+          </el-button>
+          <el-button size="small" @click="cencel">
+            取消
+          </el-button>
+        </div>
       </el-col>
     </el-row>
-    <edit-tenant-config ref="editTenantConfig" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
-import editTenantConfig from '@/views/systemConfig/tenantConfig/components/editTenantConfig'
 // import { alarmTenantList, delAlarmTenant } from '@/api/systemConfig/tenantConfig'
 export default {
   name: 'TenantConfig',
-  components: { editTenantConfig },
   data() {
     return {
-      treeLoading: false,
-      deptTree: null,
       headerValue: null,
       list: [],
+      treeLoading: false,
+      deptTree: null,
       defaultProps: {
         children: 'children',
         label: 'name'
       },
+      filterText: '',
       expandAllNode: true,
       expandNodeClick: false,
       listQuery: {
-        tenantName: '',
-        keywords: '',
-        beginTime: '',
-        endTime: '',
-        deptId: '',
-        offset: 1,
-        limit: 20,
-        sort: 'id'
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }]
       }
     }
   },
+  watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val)
+    }
+  },
   mounted() {
     this.fetchDeptTree()
     this.fetchData()
   },
   methods: {
+    filterNode(value, data) {
+      if (!value) return true
+      return data.name.indexOf(value) !== -1
+    },
     search() {},
     // 获取组织结构树
     fetchDeptTree() {
@@ -139,30 +247,49 @@
     // 获取用户数据
     fetchData() {
     },
-    // 新增
-    add() {
-      this.$refs.editTenantConfig.initDialog('create')
+    // 保存
+    saveData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          // updateDeviceModel(this.deviceForm).then(response => {
+          //   if (response.code === 200) {
+          //     this.$message.success('修改成功')
+          //     this.$emit('watchChild')
+          //     this.dialogFormVisible = false
+          //   }
+          // })
+        }
+      })
     },
-    // 修改
-    edit(row) {
-      this.$refs.editTenantConfig.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.editTenantConfig.initDialog('detail', row)
+    // 取消
+    cencel() {
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+  .titleHeadStyle{
+    font-weight: 600;
+    margin: 20px 0;
+  }
+  .titleStyle{
+    margin: 20px;
+    font-weight: 600;
+  }
+  .buttonGroup{
+    margin: 20px;
+  }
   .dept-div{
     padding-right: 12px;
     .box-card{
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: calc(100vh - 260px);
+        height: calc(100vh - 200px);
+      }
+      .el-input{
+        margin-bottom: 20px;
       }
     }
   }

diff --git a/public/config/project.config.json b/public/config/project.config.json
index 1b2796d..2e9b76b 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "https://38911d91v5.zicp.fun/",
+  "baseUrl": "http://192.168.83.40:11309",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index 689b6b1..c2e7978 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -10,7 +10,14 @@
     params
   })
 }
-
+// 报警类型
+export function alarmType(params) {
+  return request({
+    url: '/sys/dict/code/alarmType',
+    method: 'get',
+    params
+  })
+}
 // 添加字典
 export function addDict(data) {
   return request({
diff --git a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
index dba4aa9..8fbaa64 100644
--- a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
+++ b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
@@ -1,13 +1,164 @@
 <template>
-  <div>报警内容配置</div>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.alarmType"
+          size="small"
+          placeholder="报警类型"
+          clearable
+        >
+          <el-option
+            v-for="item in alarmTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.deviceType"
+          size="small"
+          placeholder="设备类型"
+          clearable
+        >
+          <el-option
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+     <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border>
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
+              {{ scope.row[column.value] }}
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+            <el-button type="text" @click="detail(scope.row)">
+              详情
+            </el-button>
+            <el-button type="text" @click="datalist(scope.row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+  </app-container>
 </template>
 
 <script>
+import { alarmType } from '@/api/system/dict'
 export default {
+  data() {
+    return {
+      columns: [
+        {
+          text: '报警内容',
+          value: 'id',
+          align: 'center'
+        },
+        {
+          text: '报警类型',
+          value: 'modelName',
+          align: 'center'
+        },
+        {
+          text: '双倍类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: true, // 加载动画
+      listQuery: {
+        alarmType: '',
+        deviceType: '',
+        offset: 1,
+        limit: 20
+      },
+      alarmTypeList: [],
+      deviceTypeList: []
+    }
+  },
+  mounted() {
+    this.getAlarmType()
+  },
+  methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 获取报警类型
+    getAlarmType() {
+      alarmType().then(response => {
+        console.log(response)
+      })
+    },
+    search() {}
+  }
 
 }
 </script>
 
-<style>
+<style rel="stylesheet/scss" lang="scss" scoped>
 
 </style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
index 28025d3..c7184f4 100644
--- a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
+++ b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
@@ -1,21 +1,31 @@
 <template>
   <app-container>
     <el-row>
-      <el-col :span="4">
+      <!--左半部分-->
+      <el-col :span="5">
         <div class="dept-div">
-          <el-card class="box-card" shadow="always" header="项目">
+          <el-card class="box-card" shadow="always">
             <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <div tabIndex="1">
-                燃气集团项目
-              </div>
-              <div tabIndex="2">
-                亦庄项目
-              </div>
+              <el-input
+                v-model="filterText"
+                clearable
+                placeholder="请输入项目名称"
+              />
+              <el-tree
+                ref="tree"
+                v-loading="treeLoading"
+                :filter-node-method="filterNode"
+                :data="deptTree"
+                :props="defaultProps"
+                :default-expand-all="expandAllNode"
+                :expand-on-click-node="expandNodeClick"
+                @node-click="handleNodeClick"
+              />
             </el-scrollbar>
           </el-card>
         </div>
       </el-col>
-      <el-col :span="20">
+      <el-col :span="19">
         <div>
           <el-row class="table-title">
             <el-col :span="6">
@@ -29,8 +39,16 @@
               </el-button>
             </el-col>
           </el-row>
-          <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-            <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <el-table v-loading="listLoading" :data="list" class="table" border>
+            <el-table-column :index="indexMethod" align="center" type="index" />
+            <el-table-column
+              v-for="column in columns"
+              :key="column.value"
+              :label="column.text"
+              :width="column.width"
+              :align="column.align"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
                 <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
@@ -73,43 +91,144 @@
 </template>
 
 <script>
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 export default {
   data() {
-    return {}
+    return {
+      listQuery: {
+        offset: 1,
+        limit: 20
+      }, // 查询条件
+      columns: [
+        {
+          text: '监控指标',
+          value: 'id',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'modelName',
+          align: 'center'
+        },
+        {
+          text: '开启报警',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '开启工单',
+          value: 'communNameGroup',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: true, // 加载动画
+      treeLoading: false,
+      deptTree: null,
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      filterText: '',
+      expandAllNode: true,
+      expandNodeClick: false
+    }
   },
-  methods: {}
+  watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val)
+    }
+  },
+  mounted() {
+    this.fetchDeptTree()
+  },
+  methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    filterNode(value, data) {
+      if (!value) return true
+      return data.name.indexOf(value) !== -1
+    },
+    // 获取组织结构树
+    fetchDeptTree() {
+      this.treeLoading = true
+      getDeptTreeList(this.listQuery).then(response => {
+        this.deptTree = toTreeList(response.data, '0', true)
+        this.treeLoading = false
+      })
+    },
+    // 点击左侧组织结构项触发
+    handleNodeClick(val) {
+      console.log(val)
+      this.headerValue = val.name
+      this.listQuery.deptId = val.id
+    }
+  }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+  .titleHeadStyle{
+    font-weight: 600;
+    margin: 20px 0;
+  }
+  .titleStyle{
+    margin: 20px;
+    font-weight: 600;
+  }
+  .buttonGroup{
+    margin: 20px;
+  }
   .dept-div{
     padding-right: 12px;
     .box-card{
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: 300px;
-        div{
-          text-align: center;
-          margin: 20px 0;
-          cursor: pointer;
-          padding: 10px;
-          i {
-            margin-right: 10px;
-          }
-        }
+        height: calc(100vh - 204px);
+      }
+      .el-input{
+        margin-bottom: 20px;
       }
     }
   }
-  .user-dept-scroll div:focus{
-    color: gray;
-    background: rgb(242, 238, 238);
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
   }
-  .user-dept-scroll div:hover{
-    color: gray;
-    background: rgb(242, 238, 238);
+  .pagination-container{
+    margin-bottom: 50px;
   }
-  .headerTeam{
-    font-size: 20px;
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
   }
 </style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
index 8303dc4..543d944 100644
--- a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
@@ -1,8 +1,5 @@
 <template>
   <div>
-    <div class="heardTitle">
-      报警推送配置
-    </div>
     <el-form
       ref="dataForm"
       :rules="rules"
@@ -91,13 +88,13 @@
       </el-row>
     </el-form>
     <div>
-      <el-button size="small" @click="up">
+      <el-button size="small" @click="updata">
         修改
       </el-button>
       <el-button size="small" @click="saveData">
         保存
       </el-button>
-      <el-button size="small" @click="dialogFormVisible = false">
+      <el-button size="small" @click="dialogStatus = true">
         取消
       </el-button>
     </div>
@@ -125,6 +122,7 @@
     }
   },
   methods: {
+    updata() {},
     saveData() {}
   }
 }
@@ -136,8 +134,4 @@
 .el-row{
     margin-left: 20px;
 }
-.heardTitle{
-    margin: 10px 0;
-    font-weight: 600;
-}
 </style>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 7ce996e..93e9c8e 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -1,44 +1,19 @@
 <template>
   <app-container>
-    <el-row>
-      <!--左半部分-->
-      <el-col :span="4">
-        <div class="dept-div">
-          <el-card class="box-card" shadow="always">
-            <el-scrollbar class="user-dept-scroll">
-              <el-menu
-                default-active="1"
-                class="el-menu-vertical-demo"
-                @select="selectMenu"
-              >
-                <el-menu-item index="1">
-                  <i class="el-icon-share" />
-                  <span slot="title">报警推送配置</span>
-                </el-menu-item>
-                <el-menu-item index="2">
-                  <i class="el-icon-upload" />
-                  <span slot="title">报警等级配置</span>
-                </el-menu-item>
-                <el-menu-item index="3">
-                  <i class="el-icon-copy-document" />
-                  <span slot="title">报警内容配置</span>
-                </el-menu-item>
-              </el-menu>
-            </el-scrollbar>
-          </el-card>
-        </div>
-      </el-col>
-      <!--右半部分-->
-      <el-col :span="20">
-        <el-card>
-          <el-scrollbar class="user-dept-scroll-content">
-            <alarm-push-condig v-if="alarmPushConShow" />
-            <alarm-leven-config v-if="alarmLevenConShow" />
-            <alarm-content-config v-if="alarmContentConShow" />
-          </el-scrollbar>
-        </el-card>
-      </el-col>
-    </el-row>
+    <el-tabs tab-position="left" class="user-dept-scroll">
+      <el-tab-pane>
+        <span slot="label"><i class="el-icon-share" />报警推送配置</span>
+        <alarm-push-condig />
+      </el-tab-pane>
+      <el-tab-pane>
+        <span slot="label"><i class="el-icon-upload" />报警等级配置</span>
+        <alarm-leven-config />
+      </el-tab-pane>
+      <el-tab-pane>
+        <span slot="label"><i class="el-icon-copy-document" />报警内容配置</span>
+        <alarm-content-config />
+      </el-tab-pane>
+    </el-tabs>
   </app-container>
 </template>
 
@@ -52,62 +27,18 @@
   components: { alarmPushCondig, alarmLevenConfig, alarmContentConfig },
   data() {
     return {
-      alarmPushConShow: true,
-      alarmLevenConShow: false,
-      alarmContentConShow: false
     }
   },
   mounted() {
   },
   methods: {
-    selectMenu(val) {
-      console.log(val)
-      if (val === '1') {
-        this.alarmPushConShow = true
-        this.alarmLevenConShow = false
-        this.alarmContentConShow = false
-      } else if (val === '2') {
-        this.alarmPushConShow = false
-        this.alarmLevenConShow = true
-        this.alarmContentConShow = false
-      } else if (val === '3') {
-        this.alarmPushConShow = false
-        this.alarmLevenConShow = false
-        this.alarmContentConShow = true
-      }
-    }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .dept-div{
-    padding-right: 12px;
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 640px);
-        div{
-          text-align: center;
-          margin: 20px 0;
-          cursor: pointer;
-          padding: 10px;
-          i {
-            margin-right: 10px;
-          }
-        }
-      }
-    }
-  }
-  .user-dept-scroll-content{
-    height: calc(100vh - 200px);
-  }
-</style>
-<style>
-  .dept-div .el-scrollbar__wrap{
-    overflow-x: auto;
-    background-color: #fff;
-    padding: 0px;
+  .user-dept-scroll{
+    width: 100%;
+    height: calc(100vh - 160px);
   }
 </style>
diff --git a/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue b/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
deleted file mode 100644
index 3f32389..0000000
--- a/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
+++ /dev/null
@@ -1,302 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="通讯方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              :disabled="dialogStatus === 'detail' ? true : false"
-              placeholder="请选择支持通信方式"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="默认坐标系" prop="coordinateType">
-            <el-input
-              v-model="deviceForm.coordinateType"
-              placeholder="请输入数据默认坐标系"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="生成工单" prop="isJobGenerate">
-            <el-select
-              v-model="deviceForm.isJobGenerate"
-              clearable
-              placeholder="请选择是否生成工单"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in jobList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="APP推送" prop="isAppPush">
-            <el-select
-              v-model="deviceForm.isAppPush"
-              clearable
-              placeholder="请选择是否APP推送"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in appPushList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="平台地址" prop="address">
-            <el-input
-              v-model="deviceForm.address"
-              placeholder="请输入平台地址"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="应用名称" prop="planName">
-            <el-input
-              v-model="deviceForm.planName"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              placeholder="请输入应用名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="APPID" prop="APPID">
-            <el-input
-              v-model="deviceForm.APPID"
-              placeholder="请输入APPID"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="APPKEY" prop="APPKEY">
-            <el-input
-              v-model="deviceForm.APPKEY"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              placeholder="请输入APPKEY"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { updateAlarmContent } from '@/api/systemConfig/tenantConfig'
-export default {
-  name: 'EditTenantConfig',
-  data() {
-    return {
-      // 通讯方式
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 是否生成工单
-      jobList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      // 是否开启App推送
-      appPushList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        communication: [],
-        coordinateType: '',
-        isJobGenerate: '',
-        isAppPush: '',
-        planName: '',
-        address: '',
-        APPID: '',
-        APPKEY: ''
-      },
-      // 表单校验规则
-      rules: {
-        communication: [{ required: true, message: '支持通讯方式必选', trigger: ['blur', 'change'] }],
-        coordinateType: [{ required: true, message: '坐标系不能为空', trigger: ['blur', 'change'] }],
-        isJobGenerate: [{ required: true, message: '是否生成工单必选', trigger: ['blur', 'change'] }],
-        isAppPush: [{ required: true, message: '是否开启APP推送必选', trigger: ['blur', 'change'] }],
-        address: [{ required: true, message: '平台地址不能为空', trigger: ['blur', 'change'] }],
-        planName: [{ required: true, message: '应用名称不能为空', trigger: ['blur', 'change'] }],
-        APPID: [{ required: true, message: 'APPID不能为空', trigger: ['blur', 'change'] }],
-        APPKEY: [{ required: true, message: 'APPKEY不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        communication: [],
-        coordinateType: '',
-        isJobGenerate: '',
-        isAppPush: '',
-        planName: '',
-        address: '',
-        APPID: '',
-        APPKEY: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          communication: row.communication.split(','),
-          coordinateType: row.coordinateType,
-          isJobGenerate: row.isJobGenerate,
-          isAppPush: row.isAppPush,
-          planName: row.planName,
-          address: row.address,
-          APPID: row.address,
-          APPKEY: row.APPKEY
-        }
-      }
-    },
-    // 修改数据
-    saveData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/systemConfig/tenantConfig/tenantConfig.vue b/src/views/systemConfig/tenantConfig/tenantConfig.vue
index 021f45f..898bf74 100644
--- a/src/views/systemConfig/tenantConfig/tenantConfig.vue
+++ b/src/views/systemConfig/tenantConfig/tenantConfig.vue
@@ -5,13 +5,16 @@
       <el-col :span="5">
         <div class="dept-div">
           <el-card class="box-card" shadow="always">
-            <div slot="header">
-              <span>项目名称</span>
-            </div>
             <el-scrollbar ref="deptScroll" class="user-dept-scroll">
+              <el-input
+                v-model="filterText"
+                clearable
+                placeholder="请输入项目名称"
+              />
               <el-tree
-                ref="tree2"
+                ref="tree"
                 v-loading="treeLoading"
+                :filter-node-method="filterNode"
                 :data="deptTree"
                 :props="defaultProps"
                 :default-expand-all="expandAllNode"
@@ -24,103 +27,208 @@
       </el-col>
       <!--右半部分-->
       <el-col :span="19">
-        <!--筛选条件-->
-        <search-area size="small" @search="search">
-          <search-item>
-            <el-input
-              v-model="listQuery.tenantName"
-              size="small"
-              clearable
-              placeholder="请输入项目名称"
-            />
-          </search-item>
-        </search-area>
-        <el-row class="table-title">
-          <el-col :span="6">
-            <div class="title-header">
-              <i class="el-icon-menu" />{{ headerValue }}
-            </div>
-          </el-col>
-          <el-col :span="12" :offset="6" class="edit_btns">
-            <el-button
-              class="edit_btn"
-              size="small"
-              @click="add"
-            >
-              新增
-            </el-button>
-          </el-col>
-        </el-row>
-        <el-table :data="list">
-          <el-table-column label="通讯协议" align="center" />
-          <el-table-column label="默认坐标系" align="center" />
-          <el-table-column label="经度" align="center" />
-          <el-table-column label="维度" align="center" />
-          <el-table-column label="生成工单" align="center" />
-          <el-table-column label="APP推送" align="center" />
-          <el-table-column label="NB平台配置" align="center">
-            <el-table-column label="平台地址" align="center" />
-            <el-table-column label="应用名称" align="center" />
-            <el-table-column label="APPID" align="center" />
-            <el-table-column label="APPKEY" align="center" />
-          </el-table-column>
-          <el-table-column label="操作" align="center">
-            <template slot-scope="scope">
-              <el-button type="text" @click="edit(scope.row)">
-                编辑
-              </el-button>
-              <el-button type="text" @click="detail(scope.row)">
-                详情
-              </el-button>
-              <el-button type="text" @click="del(scope.row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+        <el-form
+          ref="dataForm"
+          :rules="rules"
+          :model="listQuery"
+          label-well-code="right"
+          label-width="100px"
+        >
+          <div class="titleHeadStyle">
+            <div>{{ headerValue }}</div>
+          </div>
+          <div class="titleStyle">
+            基础配置
+          </div>
+          <el-row :gutter="10">
+            <el-col :span="20">
+              <el-col :span="10">
+                <el-form-item label="经度" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入经度"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="纬度" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入纬度"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="20">
+              <el-col :span="10">
+                <el-form-item label="生产工单" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请选择是否生产工单"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="APP推送" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请选择是否是否APP推送"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="20">
+              <el-col :span="10">
+                <el-form-item label="通讯协议" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入通讯协议"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="默认坐标系" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入默认坐标系"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-col>
+          </el-row>
+          <div class="titleStyle">
+            NB平台配置
+          </div>
+          <el-row :gutter="10">
+            <el-col :span="20">
+              <el-col :span="10">
+                <el-form-item label="APPID" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入APPID"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="APPKEY" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入APPKEY"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="20">
+              <el-col :span="10">
+                <el-form-item label="平台地址" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入平台地址"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="应用名称" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入应用名称"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div class="buttonGroup">
+          <el-button size="small" @click="saveData">
+            保存
+          </el-button>
+          <el-button size="small" @click="cencel">
+            取消
+          </el-button>
+        </div>
       </el-col>
     </el-row>
-    <edit-tenant-config ref="editTenantConfig" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
-import editTenantConfig from '@/views/systemConfig/tenantConfig/components/editTenantConfig'
 // import { alarmTenantList, delAlarmTenant } from '@/api/systemConfig/tenantConfig'
 export default {
   name: 'TenantConfig',
-  components: { editTenantConfig },
   data() {
     return {
-      treeLoading: false,
-      deptTree: null,
       headerValue: null,
       list: [],
+      treeLoading: false,
+      deptTree: null,
       defaultProps: {
         children: 'children',
         label: 'name'
       },
+      filterText: '',
       expandAllNode: true,
       expandNodeClick: false,
       listQuery: {
-        tenantName: '',
-        keywords: '',
-        beginTime: '',
-        endTime: '',
-        deptId: '',
-        offset: 1,
-        limit: 20,
-        sort: 'id'
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }]
       }
     }
   },
+  watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val)
+    }
+  },
   mounted() {
     this.fetchDeptTree()
     this.fetchData()
   },
   methods: {
+    filterNode(value, data) {
+      if (!value) return true
+      return data.name.indexOf(value) !== -1
+    },
     search() {},
     // 获取组织结构树
     fetchDeptTree() {
@@ -139,30 +247,49 @@
     // 获取用户数据
     fetchData() {
     },
-    // 新增
-    add() {
-      this.$refs.editTenantConfig.initDialog('create')
+    // 保存
+    saveData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          // updateDeviceModel(this.deviceForm).then(response => {
+          //   if (response.code === 200) {
+          //     this.$message.success('修改成功')
+          //     this.$emit('watchChild')
+          //     this.dialogFormVisible = false
+          //   }
+          // })
+        }
+      })
     },
-    // 修改
-    edit(row) {
-      this.$refs.editTenantConfig.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.editTenantConfig.initDialog('detail', row)
+    // 取消
+    cencel() {
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+  .titleHeadStyle{
+    font-weight: 600;
+    margin: 20px 0;
+  }
+  .titleStyle{
+    margin: 20px;
+    font-weight: 600;
+  }
+  .buttonGroup{
+    margin: 20px;
+  }
   .dept-div{
     padding-right: 12px;
     .box-card{
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: calc(100vh - 260px);
+        height: calc(100vh - 200px);
+      }
+      .el-input{
+        margin-bottom: 20px;
       }
     }
   }
diff --git a/src/views/systemConfig/viewsConfig/components/appConfig.vue b/src/views/systemConfig/viewsConfig/components/appConfig.vue
new file mode 100644
index 0000000..cdc75c9
--- /dev/null
+++ b/src/views/systemConfig/viewsConfig/components/appConfig.vue
@@ -0,0 +1,185 @@
+<template>
+  <div>
+    <div class="dept-div">
+      <el-card class="box-card" shadow="hover">
+        <el-scrollbar ref="deptScroll" class="user-dept-scroll">
+          <el-col :span="8">
+            <el-card>
+              <div>标题文字：</div>
+              <div class="inputUpDown">
+                <el-input v-model="titleValue" clearable :disabled="titleDisabled" />
+              </div>
+              <div>
+                <el-button size="small" @click="titleUpData">
+                  修改
+                </el-button>
+                <el-button size="small" @click="titleSure">
+                  保存
+                </el-button>
+                <el-button size="small" @click="titleDisabled = true">
+                  取消
+                </el-button>
+              </div>
+            </el-card>
+            <el-card>
+              <div>登录页文字：</div>
+              <div class="inputUpDown">
+                <el-input v-model="loginTitleValue" clearable :disabled="loginDisabled" />
+              </div>
+              <div>
+                <el-button size="small" @click="loginUpdata">
+                  修改
+                </el-button>
+                <el-button size="small" @click="loginSure">
+                  保存
+                </el-button>
+                <el-button size="small" @click="loginDisabled = true">
+                  取消
+                </el-button>
+              </div>
+            </el-card>
+            <el-card>
+              <div>地图：</div>
+              <div class="inputUpDown">
+                <el-select v-model="mapValue" clearable :disabled="mapDisabled">
+                  <el-option label="高德地图" value="1" />
+                  <el-option label="百度地图" value="2" />
+                  <el-option label="天地图" value="3" />
+                  <el-option label="其他地图" value="4" />
+                </el-select>
+                <el-input v-if="otherMapShow" v-model="otherMapValue" placeholder="请输入地址" />
+              </div>
+              <div>
+                <el-button size="small" @click="mapUpdata">
+                  修改
+                </el-button>
+                <el-button size="small" @click="mapSure">
+                  保存
+                </el-button>
+                <el-button size="small" @click="mapCencel">
+                  取消
+                </el-button>
+              </div>
+            </el-card>
+          </el-col>
+          <el-col :span="16">
+            <el-col>
+              <el-card header="浏览器页签: 页签Logo(图片不能超过200KB)">
+                <el-upload
+                  ref="upload"
+                  :before-upload="handleBeforeUpload"
+                  :on-preview="handlePictureCardPreview"
+                  :on-remove="handleRemove"
+                  :on-exceed="handleExceed"
+                  :on-change="handleChange"
+                  :http-request="uploadFile"
+                  :file-list="imageList"
+                  :limit="4"
+                  :class="{hide:hideUpload}"
+                  multiple
+                  action="string"
+                  accept=".jpg,.jpeg,.png "
+                  list-type="picture-card"
+                >
+                  <i class="el-icon-plus" />
+                </el-upload>
+                <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
+                  <div class="imgBox">
+                    <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto;">
+                  </div>
+                </el-dialog>
+              </el-card>
+            </el-col>
+            <el-col>
+              <el-card header="标题: 系统Logo(图片不能超过200KB)">
+                <el-upload
+                  ref="upload"
+                  :before-upload="handleBeforeUpload"
+                  :on-preview="handlePictureCardPreview"
+                  :on-remove="handleRemove"
+                  :on-exceed="handleExceed"
+                  :on-change="handleChange"
+                  :http-request="uploadFile"
+                  :file-list="imageList"
+                  :limit="4"
+                  :class="{hide:hideUpload}"
+                  multiple
+                  action="string"
+                  accept=".jpg,.jpeg,.png "
+                  list-type="picture-card"
+                >
+                  <i class="el-icon-plus" />
+                </el-upload>
+                <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
+                  <div class="imgBox">
+                    <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto;">
+                  </div>
+                </el-dialog>
+              </el-card>
+            </el-col>
+            <el-col>
+              <el-card header="登录页: 登录页Logo(图片不能超过200KB)">
+                <el-upload
+                  ref="upload"
+                  :before-upload="handleBeforeUpload"
+                  :on-preview="handlePictureCardPreview"
+                  :on-remove="handleRemove"
+                  :on-exceed="handleExceed"
+                  :on-change="handleChange"
+                  :http-request="uploadFile"
+                  :file-list="imageList"
+                  :limit="4"
+                  :class="{hide:hideUpload}"
+                  multiple
+                  action="string"
+                  accept=".jpg,.jpeg,.png "
+                  list-type="picture-card"
+                >
+                  <i class="el-icon-plus" />
+                </el-upload>
+                <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
+                  <div class="imgBox">
+                    <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto;">
+                  </div>
+                </el-dialog>
+              </el-card>
+            </el-col>
+          </el-col>
+        </el-scrollbar>
+      </el-card>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      titleValue: '',
+      loginTitleValue: '',
+      titleDisabled: true,
+      loginDisabled: true,
+      mapDisabled: true,
+      otherMapShow: false,
+      mapValue: '',
+      otherMapValue: ''
+    }
+  }
+
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .dept-div{
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: calc(100vh - 240px);
+      }
+    }
+  }
+  .inputUpDown{
+    margin: 20px 0;
+  }
+</style>

diff --git a/public/config/project.config.json b/public/config/project.config.json
index 1b2796d..2e9b76b 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "https://38911d91v5.zicp.fun/",
+  "baseUrl": "http://192.168.83.40:11309",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index 689b6b1..c2e7978 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -10,7 +10,14 @@
     params
   })
 }
-
+// 报警类型
+export function alarmType(params) {
+  return request({
+    url: '/sys/dict/code/alarmType',
+    method: 'get',
+    params
+  })
+}
 // 添加字典
 export function addDict(data) {
   return request({
diff --git a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
index dba4aa9..8fbaa64 100644
--- a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
+++ b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
@@ -1,13 +1,164 @@
 <template>
-  <div>报警内容配置</div>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.alarmType"
+          size="small"
+          placeholder="报警类型"
+          clearable
+        >
+          <el-option
+            v-for="item in alarmTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.deviceType"
+          size="small"
+          placeholder="设备类型"
+          clearable
+        >
+          <el-option
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+     <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border>
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
+              {{ scope.row[column.value] }}
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+            <el-button type="text" @click="detail(scope.row)">
+              详情
+            </el-button>
+            <el-button type="text" @click="datalist(scope.row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+  </app-container>
 </template>
 
 <script>
+import { alarmType } from '@/api/system/dict'
 export default {
+  data() {
+    return {
+      columns: [
+        {
+          text: '报警内容',
+          value: 'id',
+          align: 'center'
+        },
+        {
+          text: '报警类型',
+          value: 'modelName',
+          align: 'center'
+        },
+        {
+          text: '双倍类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: true, // 加载动画
+      listQuery: {
+        alarmType: '',
+        deviceType: '',
+        offset: 1,
+        limit: 20
+      },
+      alarmTypeList: [],
+      deviceTypeList: []
+    }
+  },
+  mounted() {
+    this.getAlarmType()
+  },
+  methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 获取报警类型
+    getAlarmType() {
+      alarmType().then(response => {
+        console.log(response)
+      })
+    },
+    search() {}
+  }
 
 }
 </script>
 
-<style>
+<style rel="stylesheet/scss" lang="scss" scoped>
 
 </style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
index 28025d3..c7184f4 100644
--- a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
+++ b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
@@ -1,21 +1,31 @@
 <template>
   <app-container>
     <el-row>
-      <el-col :span="4">
+      <!--左半部分-->
+      <el-col :span="5">
         <div class="dept-div">
-          <el-card class="box-card" shadow="always" header="项目">
+          <el-card class="box-card" shadow="always">
             <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <div tabIndex="1">
-                燃气集团项目
-              </div>
-              <div tabIndex="2">
-                亦庄项目
-              </div>
+              <el-input
+                v-model="filterText"
+                clearable
+                placeholder="请输入项目名称"
+              />
+              <el-tree
+                ref="tree"
+                v-loading="treeLoading"
+                :filter-node-method="filterNode"
+                :data="deptTree"
+                :props="defaultProps"
+                :default-expand-all="expandAllNode"
+                :expand-on-click-node="expandNodeClick"
+                @node-click="handleNodeClick"
+              />
             </el-scrollbar>
           </el-card>
         </div>
       </el-col>
-      <el-col :span="20">
+      <el-col :span="19">
         <div>
           <el-row class="table-title">
             <el-col :span="6">
@@ -29,8 +39,16 @@
               </el-button>
             </el-col>
           </el-row>
-          <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-            <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <el-table v-loading="listLoading" :data="list" class="table" border>
+            <el-table-column :index="indexMethod" align="center" type="index" />
+            <el-table-column
+              v-for="column in columns"
+              :key="column.value"
+              :label="column.text"
+              :width="column.width"
+              :align="column.align"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
                 <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
@@ -73,43 +91,144 @@
 </template>
 
 <script>
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 export default {
   data() {
-    return {}
+    return {
+      listQuery: {
+        offset: 1,
+        limit: 20
+      }, // 查询条件
+      columns: [
+        {
+          text: '监控指标',
+          value: 'id',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'modelName',
+          align: 'center'
+        },
+        {
+          text: '开启报警',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '开启工单',
+          value: 'communNameGroup',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: true, // 加载动画
+      treeLoading: false,
+      deptTree: null,
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      filterText: '',
+      expandAllNode: true,
+      expandNodeClick: false
+    }
   },
-  methods: {}
+  watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val)
+    }
+  },
+  mounted() {
+    this.fetchDeptTree()
+  },
+  methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    filterNode(value, data) {
+      if (!value) return true
+      return data.name.indexOf(value) !== -1
+    },
+    // 获取组织结构树
+    fetchDeptTree() {
+      this.treeLoading = true
+      getDeptTreeList(this.listQuery).then(response => {
+        this.deptTree = toTreeList(response.data, '0', true)
+        this.treeLoading = false
+      })
+    },
+    // 点击左侧组织结构项触发
+    handleNodeClick(val) {
+      console.log(val)
+      this.headerValue = val.name
+      this.listQuery.deptId = val.id
+    }
+  }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+  .titleHeadStyle{
+    font-weight: 600;
+    margin: 20px 0;
+  }
+  .titleStyle{
+    margin: 20px;
+    font-weight: 600;
+  }
+  .buttonGroup{
+    margin: 20px;
+  }
   .dept-div{
     padding-right: 12px;
     .box-card{
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: 300px;
-        div{
-          text-align: center;
-          margin: 20px 0;
-          cursor: pointer;
-          padding: 10px;
-          i {
-            margin-right: 10px;
-          }
-        }
+        height: calc(100vh - 204px);
+      }
+      .el-input{
+        margin-bottom: 20px;
       }
     }
   }
-  .user-dept-scroll div:focus{
-    color: gray;
-    background: rgb(242, 238, 238);
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
   }
-  .user-dept-scroll div:hover{
-    color: gray;
-    background: rgb(242, 238, 238);
+  .pagination-container{
+    margin-bottom: 50px;
   }
-  .headerTeam{
-    font-size: 20px;
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
   }
 </style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
index 8303dc4..543d944 100644
--- a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
@@ -1,8 +1,5 @@
 <template>
   <div>
-    <div class="heardTitle">
-      报警推送配置
-    </div>
     <el-form
       ref="dataForm"
       :rules="rules"
@@ -91,13 +88,13 @@
       </el-row>
     </el-form>
     <div>
-      <el-button size="small" @click="up">
+      <el-button size="small" @click="updata">
         修改
       </el-button>
       <el-button size="small" @click="saveData">
         保存
       </el-button>
-      <el-button size="small" @click="dialogFormVisible = false">
+      <el-button size="small" @click="dialogStatus = true">
         取消
       </el-button>
     </div>
@@ -125,6 +122,7 @@
     }
   },
   methods: {
+    updata() {},
     saveData() {}
   }
 }
@@ -136,8 +134,4 @@
 .el-row{
     margin-left: 20px;
 }
-.heardTitle{
-    margin: 10px 0;
-    font-weight: 600;
-}
 </style>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 7ce996e..93e9c8e 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -1,44 +1,19 @@
 <template>
   <app-container>
-    <el-row>
-      <!--左半部分-->
-      <el-col :span="4">
-        <div class="dept-div">
-          <el-card class="box-card" shadow="always">
-            <el-scrollbar class="user-dept-scroll">
-              <el-menu
-                default-active="1"
-                class="el-menu-vertical-demo"
-                @select="selectMenu"
-              >
-                <el-menu-item index="1">
-                  <i class="el-icon-share" />
-                  <span slot="title">报警推送配置</span>
-                </el-menu-item>
-                <el-menu-item index="2">
-                  <i class="el-icon-upload" />
-                  <span slot="title">报警等级配置</span>
-                </el-menu-item>
-                <el-menu-item index="3">
-                  <i class="el-icon-copy-document" />
-                  <span slot="title">报警内容配置</span>
-                </el-menu-item>
-              </el-menu>
-            </el-scrollbar>
-          </el-card>
-        </div>
-      </el-col>
-      <!--右半部分-->
-      <el-col :span="20">
-        <el-card>
-          <el-scrollbar class="user-dept-scroll-content">
-            <alarm-push-condig v-if="alarmPushConShow" />
-            <alarm-leven-config v-if="alarmLevenConShow" />
-            <alarm-content-config v-if="alarmContentConShow" />
-          </el-scrollbar>
-        </el-card>
-      </el-col>
-    </el-row>
+    <el-tabs tab-position="left" class="user-dept-scroll">
+      <el-tab-pane>
+        <span slot="label"><i class="el-icon-share" />报警推送配置</span>
+        <alarm-push-condig />
+      </el-tab-pane>
+      <el-tab-pane>
+        <span slot="label"><i class="el-icon-upload" />报警等级配置</span>
+        <alarm-leven-config />
+      </el-tab-pane>
+      <el-tab-pane>
+        <span slot="label"><i class="el-icon-copy-document" />报警内容配置</span>
+        <alarm-content-config />
+      </el-tab-pane>
+    </el-tabs>
   </app-container>
 </template>
 
@@ -52,62 +27,18 @@
   components: { alarmPushCondig, alarmLevenConfig, alarmContentConfig },
   data() {
     return {
-      alarmPushConShow: true,
-      alarmLevenConShow: false,
-      alarmContentConShow: false
     }
   },
   mounted() {
   },
   methods: {
-    selectMenu(val) {
-      console.log(val)
-      if (val === '1') {
-        this.alarmPushConShow = true
-        this.alarmLevenConShow = false
-        this.alarmContentConShow = false
-      } else if (val === '2') {
-        this.alarmPushConShow = false
-        this.alarmLevenConShow = true
-        this.alarmContentConShow = false
-      } else if (val === '3') {
-        this.alarmPushConShow = false
-        this.alarmLevenConShow = false
-        this.alarmContentConShow = true
-      }
-    }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .dept-div{
-    padding-right: 12px;
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 640px);
-        div{
-          text-align: center;
-          margin: 20px 0;
-          cursor: pointer;
-          padding: 10px;
-          i {
-            margin-right: 10px;
-          }
-        }
-      }
-    }
-  }
-  .user-dept-scroll-content{
-    height: calc(100vh - 200px);
-  }
-</style>
-<style>
-  .dept-div .el-scrollbar__wrap{
-    overflow-x: auto;
-    background-color: #fff;
-    padding: 0px;
+  .user-dept-scroll{
+    width: 100%;
+    height: calc(100vh - 160px);
   }
 </style>
diff --git a/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue b/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
deleted file mode 100644
index 3f32389..0000000
--- a/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
+++ /dev/null
@@ -1,302 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="通讯方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              :disabled="dialogStatus === 'detail' ? true : false"
-              placeholder="请选择支持通信方式"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="默认坐标系" prop="coordinateType">
-            <el-input
-              v-model="deviceForm.coordinateType"
-              placeholder="请输入数据默认坐标系"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="生成工单" prop="isJobGenerate">
-            <el-select
-              v-model="deviceForm.isJobGenerate"
-              clearable
-              placeholder="请选择是否生成工单"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in jobList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="APP推送" prop="isAppPush">
-            <el-select
-              v-model="deviceForm.isAppPush"
-              clearable
-              placeholder="请选择是否APP推送"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in appPushList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="平台地址" prop="address">
-            <el-input
-              v-model="deviceForm.address"
-              placeholder="请输入平台地址"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="应用名称" prop="planName">
-            <el-input
-              v-model="deviceForm.planName"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              placeholder="请输入应用名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="APPID" prop="APPID">
-            <el-input
-              v-model="deviceForm.APPID"
-              placeholder="请输入APPID"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="APPKEY" prop="APPKEY">
-            <el-input
-              v-model="deviceForm.APPKEY"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              placeholder="请输入APPKEY"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { updateAlarmContent } from '@/api/systemConfig/tenantConfig'
-export default {
-  name: 'EditTenantConfig',
-  data() {
-    return {
-      // 通讯方式
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 是否生成工单
-      jobList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      // 是否开启App推送
-      appPushList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        communication: [],
-        coordinateType: '',
-        isJobGenerate: '',
-        isAppPush: '',
-        planName: '',
-        address: '',
-        APPID: '',
-        APPKEY: ''
-      },
-      // 表单校验规则
-      rules: {
-        communication: [{ required: true, message: '支持通讯方式必选', trigger: ['blur', 'change'] }],
-        coordinateType: [{ required: true, message: '坐标系不能为空', trigger: ['blur', 'change'] }],
-        isJobGenerate: [{ required: true, message: '是否生成工单必选', trigger: ['blur', 'change'] }],
-        isAppPush: [{ required: true, message: '是否开启APP推送必选', trigger: ['blur', 'change'] }],
-        address: [{ required: true, message: '平台地址不能为空', trigger: ['blur', 'change'] }],
-        planName: [{ required: true, message: '应用名称不能为空', trigger: ['blur', 'change'] }],
-        APPID: [{ required: true, message: 'APPID不能为空', trigger: ['blur', 'change'] }],
-        APPKEY: [{ required: true, message: 'APPKEY不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        communication: [],
-        coordinateType: '',
-        isJobGenerate: '',
-        isAppPush: '',
-        planName: '',
-        address: '',
-        APPID: '',
-        APPKEY: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          communication: row.communication.split(','),
-          coordinateType: row.coordinateType,
-          isJobGenerate: row.isJobGenerate,
-          isAppPush: row.isAppPush,
-          planName: row.planName,
-          address: row.address,
-          APPID: row.address,
-          APPKEY: row.APPKEY
-        }
-      }
-    },
-    // 修改数据
-    saveData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/systemConfig/tenantConfig/tenantConfig.vue b/src/views/systemConfig/tenantConfig/tenantConfig.vue
index 021f45f..898bf74 100644
--- a/src/views/systemConfig/tenantConfig/tenantConfig.vue
+++ b/src/views/systemConfig/tenantConfig/tenantConfig.vue
@@ -5,13 +5,16 @@
       <el-col :span="5">
         <div class="dept-div">
           <el-card class="box-card" shadow="always">
-            <div slot="header">
-              <span>项目名称</span>
-            </div>
             <el-scrollbar ref="deptScroll" class="user-dept-scroll">
+              <el-input
+                v-model="filterText"
+                clearable
+                placeholder="请输入项目名称"
+              />
               <el-tree
-                ref="tree2"
+                ref="tree"
                 v-loading="treeLoading"
+                :filter-node-method="filterNode"
                 :data="deptTree"
                 :props="defaultProps"
                 :default-expand-all="expandAllNode"
@@ -24,103 +27,208 @@
       </el-col>
       <!--右半部分-->
       <el-col :span="19">
-        <!--筛选条件-->
-        <search-area size="small" @search="search">
-          <search-item>
-            <el-input
-              v-model="listQuery.tenantName"
-              size="small"
-              clearable
-              placeholder="请输入项目名称"
-            />
-          </search-item>
-        </search-area>
-        <el-row class="table-title">
-          <el-col :span="6">
-            <div class="title-header">
-              <i class="el-icon-menu" />{{ headerValue }}
-            </div>
-          </el-col>
-          <el-col :span="12" :offset="6" class="edit_btns">
-            <el-button
-              class="edit_btn"
-              size="small"
-              @click="add"
-            >
-              新增
-            </el-button>
-          </el-col>
-        </el-row>
-        <el-table :data="list">
-          <el-table-column label="通讯协议" align="center" />
-          <el-table-column label="默认坐标系" align="center" />
-          <el-table-column label="经度" align="center" />
-          <el-table-column label="维度" align="center" />
-          <el-table-column label="生成工单" align="center" />
-          <el-table-column label="APP推送" align="center" />
-          <el-table-column label="NB平台配置" align="center">
-            <el-table-column label="平台地址" align="center" />
-            <el-table-column label="应用名称" align="center" />
-            <el-table-column label="APPID" align="center" />
-            <el-table-column label="APPKEY" align="center" />
-          </el-table-column>
-          <el-table-column label="操作" align="center">
-            <template slot-scope="scope">
-              <el-button type="text" @click="edit(scope.row)">
-                编辑
-              </el-button>
-              <el-button type="text" @click="detail(scope.row)">
-                详情
-              </el-button>
-              <el-button type="text" @click="del(scope.row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+        <el-form
+          ref="dataForm"
+          :rules="rules"
+          :model="listQuery"
+          label-well-code="right"
+          label-width="100px"
+        >
+          <div class="titleHeadStyle">
+            <div>{{ headerValue }}</div>
+          </div>
+          <div class="titleStyle">
+            基础配置
+          </div>
+          <el-row :gutter="10">
+            <el-col :span="20">
+              <el-col :span="10">
+                <el-form-item label="经度" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入经度"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="纬度" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入纬度"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="20">
+              <el-col :span="10">
+                <el-form-item label="生产工单" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请选择是否生产工单"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="APP推送" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请选择是否是否APP推送"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="20">
+              <el-col :span="10">
+                <el-form-item label="通讯协议" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入通讯协议"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="默认坐标系" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入默认坐标系"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-col>
+          </el-row>
+          <div class="titleStyle">
+            NB平台配置
+          </div>
+          <el-row :gutter="10">
+            <el-col :span="20">
+              <el-col :span="10">
+                <el-form-item label="APPID" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入APPID"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="APPKEY" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入APPKEY"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="20">
+              <el-col :span="10">
+                <el-form-item label="平台地址" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入平台地址"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="应用名称" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入应用名称"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div class="buttonGroup">
+          <el-button size="small" @click="saveData">
+            保存
+          </el-button>
+          <el-button size="small" @click="cencel">
+            取消
+          </el-button>
+        </div>
       </el-col>
     </el-row>
-    <edit-tenant-config ref="editTenantConfig" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
-import editTenantConfig from '@/views/systemConfig/tenantConfig/components/editTenantConfig'
 // import { alarmTenantList, delAlarmTenant } from '@/api/systemConfig/tenantConfig'
 export default {
   name: 'TenantConfig',
-  components: { editTenantConfig },
   data() {
     return {
-      treeLoading: false,
-      deptTree: null,
       headerValue: null,
       list: [],
+      treeLoading: false,
+      deptTree: null,
       defaultProps: {
         children: 'children',
         label: 'name'
       },
+      filterText: '',
       expandAllNode: true,
       expandNodeClick: false,
       listQuery: {
-        tenantName: '',
-        keywords: '',
-        beginTime: '',
-        endTime: '',
-        deptId: '',
-        offset: 1,
-        limit: 20,
-        sort: 'id'
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }]
       }
     }
   },
+  watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val)
+    }
+  },
   mounted() {
     this.fetchDeptTree()
     this.fetchData()
   },
   methods: {
+    filterNode(value, data) {
+      if (!value) return true
+      return data.name.indexOf(value) !== -1
+    },
     search() {},
     // 获取组织结构树
     fetchDeptTree() {
@@ -139,30 +247,49 @@
     // 获取用户数据
     fetchData() {
     },
-    // 新增
-    add() {
-      this.$refs.editTenantConfig.initDialog('create')
+    // 保存
+    saveData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          // updateDeviceModel(this.deviceForm).then(response => {
+          //   if (response.code === 200) {
+          //     this.$message.success('修改成功')
+          //     this.$emit('watchChild')
+          //     this.dialogFormVisible = false
+          //   }
+          // })
+        }
+      })
     },
-    // 修改
-    edit(row) {
-      this.$refs.editTenantConfig.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.editTenantConfig.initDialog('detail', row)
+    // 取消
+    cencel() {
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+  .titleHeadStyle{
+    font-weight: 600;
+    margin: 20px 0;
+  }
+  .titleStyle{
+    margin: 20px;
+    font-weight: 600;
+  }
+  .buttonGroup{
+    margin: 20px;
+  }
   .dept-div{
     padding-right: 12px;
     .box-card{
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: calc(100vh - 260px);
+        height: calc(100vh - 200px);
+      }
+      .el-input{
+        margin-bottom: 20px;
       }
     }
   }
diff --git a/src/views/systemConfig/viewsConfig/components/appConfig.vue b/src/views/systemConfig/viewsConfig/components/appConfig.vue
new file mode 100644
index 0000000..cdc75c9
--- /dev/null
+++ b/src/views/systemConfig/viewsConfig/components/appConfig.vue
@@ -0,0 +1,185 @@
+<template>
+  <div>
+    <div class="dept-div">
+      <el-card class="box-card" shadow="hover">
+        <el-scrollbar ref="deptScroll" class="user-dept-scroll">
+          <el-col :span="8">
+            <el-card>
+              <div>标题文字：</div>
+              <div class="inputUpDown">
+                <el-input v-model="titleValue" clearable :disabled="titleDisabled" />
+              </div>
+              <div>
+                <el-button size="small" @click="titleUpData">
+                  修改
+                </el-button>
+                <el-button size="small" @click="titleSure">
+                  保存
+                </el-button>
+                <el-button size="small" @click="titleDisabled = true">
+                  取消
+                </el-button>
+              </div>
+            </el-card>
+            <el-card>
+              <div>登录页文字：</div>
+              <div class="inputUpDown">
+                <el-input v-model="loginTitleValue" clearable :disabled="loginDisabled" />
+              </div>
+              <div>
+                <el-button size="small" @click="loginUpdata">
+                  修改
+                </el-button>
+                <el-button size="small" @click="loginSure">
+                  保存
+                </el-button>
+                <el-button size="small" @click="loginDisabled = true">
+                  取消
+                </el-button>
+              </div>
+            </el-card>
+            <el-card>
+              <div>地图：</div>
+              <div class="inputUpDown">
+                <el-select v-model="mapValue" clearable :disabled="mapDisabled">
+                  <el-option label="高德地图" value="1" />
+                  <el-option label="百度地图" value="2" />
+                  <el-option label="天地图" value="3" />
+                  <el-option label="其他地图" value="4" />
+                </el-select>
+                <el-input v-if="otherMapShow" v-model="otherMapValue" placeholder="请输入地址" />
+              </div>
+              <div>
+                <el-button size="small" @click="mapUpdata">
+                  修改
+                </el-button>
+                <el-button size="small" @click="mapSure">
+                  保存
+                </el-button>
+                <el-button size="small" @click="mapCencel">
+                  取消
+                </el-button>
+              </div>
+            </el-card>
+          </el-col>
+          <el-col :span="16">
+            <el-col>
+              <el-card header="浏览器页签: 页签Logo(图片不能超过200KB)">
+                <el-upload
+                  ref="upload"
+                  :before-upload="handleBeforeUpload"
+                  :on-preview="handlePictureCardPreview"
+                  :on-remove="handleRemove"
+                  :on-exceed="handleExceed"
+                  :on-change="handleChange"
+                  :http-request="uploadFile"
+                  :file-list="imageList"
+                  :limit="4"
+                  :class="{hide:hideUpload}"
+                  multiple
+                  action="string"
+                  accept=".jpg,.jpeg,.png "
+                  list-type="picture-card"
+                >
+                  <i class="el-icon-plus" />
+                </el-upload>
+                <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
+                  <div class="imgBox">
+                    <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto;">
+                  </div>
+                </el-dialog>
+              </el-card>
+            </el-col>
+            <el-col>
+              <el-card header="标题: 系统Logo(图片不能超过200KB)">
+                <el-upload
+                  ref="upload"
+                  :before-upload="handleBeforeUpload"
+                  :on-preview="handlePictureCardPreview"
+                  :on-remove="handleRemove"
+                  :on-exceed="handleExceed"
+                  :on-change="handleChange"
+                  :http-request="uploadFile"
+                  :file-list="imageList"
+                  :limit="4"
+                  :class="{hide:hideUpload}"
+                  multiple
+                  action="string"
+                  accept=".jpg,.jpeg,.png "
+                  list-type="picture-card"
+                >
+                  <i class="el-icon-plus" />
+                </el-upload>
+                <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
+                  <div class="imgBox">
+                    <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto;">
+                  </div>
+                </el-dialog>
+              </el-card>
+            </el-col>
+            <el-col>
+              <el-card header="登录页: 登录页Logo(图片不能超过200KB)">
+                <el-upload
+                  ref="upload"
+                  :before-upload="handleBeforeUpload"
+                  :on-preview="handlePictureCardPreview"
+                  :on-remove="handleRemove"
+                  :on-exceed="handleExceed"
+                  :on-change="handleChange"
+                  :http-request="uploadFile"
+                  :file-list="imageList"
+                  :limit="4"
+                  :class="{hide:hideUpload}"
+                  multiple
+                  action="string"
+                  accept=".jpg,.jpeg,.png "
+                  list-type="picture-card"
+                >
+                  <i class="el-icon-plus" />
+                </el-upload>
+                <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
+                  <div class="imgBox">
+                    <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto;">
+                  </div>
+                </el-dialog>
+              </el-card>
+            </el-col>
+          </el-col>
+        </el-scrollbar>
+      </el-card>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      titleValue: '',
+      loginTitleValue: '',
+      titleDisabled: true,
+      loginDisabled: true,
+      mapDisabled: true,
+      otherMapShow: false,
+      mapValue: '',
+      otherMapValue: ''
+    }
+  }
+
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .dept-div{
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: calc(100vh - 240px);
+      }
+    }
+  }
+  .inputUpDown{
+    margin: 20px 0;
+  }
+</style>
diff --git a/src/views/systemConfig/viewsConfig/components/pcConfig.vue b/src/views/systemConfig/viewsConfig/components/pcConfig.vue
new file mode 100644
index 0000000..cdc75c9
--- /dev/null
+++ b/src/views/systemConfig/viewsConfig/components/pcConfig.vue
@@ -0,0 +1,185 @@
+<template>
+  <div>
+    <div class="dept-div">
+      <el-card class="box-card" shadow="hover">
+        <el-scrollbar ref="deptScroll" class="user-dept-scroll">
+          <el-col :span="8">
+            <el-card>
+              <div>标题文字：</div>
+              <div class="inputUpDown">
+                <el-input v-model="titleValue" clearable :disabled="titleDisabled" />
+              </div>
+              <div>
+                <el-button size="small" @click="titleUpData">
+                  修改
+                </el-button>
+                <el-button size="small" @click="titleSure">
+                  保存
+                </el-button>
+                <el-button size="small" @click="titleDisabled = true">
+                  取消
+                </el-button>
+              </div>
+            </el-card>
+            <el-card>
+              <div>登录页文字：</div>
+              <div class="inputUpDown">
+                <el-input v-model="loginTitleValue" clearable :disabled="loginDisabled" />
+              </div>
+              <div>
+                <el-button size="small" @click="loginUpdata">
+                  修改
+                </el-button>
+                <el-button size="small" @click="loginSure">
+                  保存
+                </el-button>
+                <el-button size="small" @click="loginDisabled = true">
+                  取消
+                </el-button>
+              </div>
+            </el-card>
+            <el-card>
+              <div>地图：</div>
+              <div class="inputUpDown">
+                <el-select v-model="mapValue" clearable :disabled="mapDisabled">
+                  <el-option label="高德地图" value="1" />
+                  <el-option label="百度地图" value="2" />
+                  <el-option label="天地图" value="3" />
+                  <el-option label="其他地图" value="4" />
+                </el-select>
+                <el-input v-if="otherMapShow" v-model="otherMapValue" placeholder="请输入地址" />
+              </div>
+              <div>
+                <el-button size="small" @click="mapUpdata">
+                  修改
+                </el-button>
+                <el-button size="small" @click="mapSure">
+                  保存
+                </el-button>
+                <el-button size="small" @click="mapCencel">
+                  取消
+                </el-button>
+              </div>
+            </el-card>
+          </el-col>
+          <el-col :span="16">
+            <el-col>
+              <el-card header="浏览器页签: 页签Logo(图片不能超过200KB)">
+                <el-upload
+                  ref="upload"
+                  :before-upload="handleBeforeUpload"
+                  :on-preview="handlePictureCardPreview"
+                  :on-remove="handleRemove"
+                  :on-exceed="handleExceed"
+                  :on-change="handleChange"
+                  :http-request="uploadFile"
+                  :file-list="imageList"
+                  :limit="4"
+                  :class="{hide:hideUpload}"
+                  multiple
+                  action="string"
+                  accept=".jpg,.jpeg,.png "
+                  list-type="picture-card"
+                >
+                  <i class="el-icon-plus" />
+                </el-upload>
+                <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
+                  <div class="imgBox">
+                    <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto;">
+                  </div>
+                </el-dialog>
+              </el-card>
+            </el-col>
+            <el-col>
+              <el-card header="标题: 系统Logo(图片不能超过200KB)">
+                <el-upload
+                  ref="upload"
+                  :before-upload="handleBeforeUpload"
+                  :on-preview="handlePictureCardPreview"
+                  :on-remove="handleRemove"
+                  :on-exceed="handleExceed"
+                  :on-change="handleChange"
+                  :http-request="uploadFile"
+                  :file-list="imageList"
+                  :limit="4"
+                  :class="{hide:hideUpload}"
+                  multiple
+                  action="string"
+                  accept=".jpg,.jpeg,.png "
+                  list-type="picture-card"
+                >
+                  <i class="el-icon-plus" />
+                </el-upload>
+                <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
+                  <div class="imgBox">
+                    <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto;">
+                  </div>
+                </el-dialog>
+              </el-card>
+            </el-col>
+            <el-col>
+              <el-card header="登录页: 登录页Logo(图片不能超过200KB)">
+                <el-upload
+                  ref="upload"
+                  :before-upload="handleBeforeUpload"
+                  :on-preview="handlePictureCardPreview"
+                  :on-remove="handleRemove"
+                  :on-exceed="handleExceed"
+                  :on-change="handleChange"
+                  :http-request="uploadFile"
+                  :file-list="imageList"
+                  :limit="4"
+                  :class="{hide:hideUpload}"
+                  multiple
+                  action="string"
+                  accept=".jpg,.jpeg,.png "
+                  list-type="picture-card"
+                >
+                  <i class="el-icon-plus" />
+                </el-upload>
+                <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
+                  <div class="imgBox">
+                    <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto;">
+                  </div>
+                </el-dialog>
+              </el-card>
+            </el-col>
+          </el-col>
+        </el-scrollbar>
+      </el-card>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      titleValue: '',
+      loginTitleValue: '',
+      titleDisabled: true,
+      loginDisabled: true,
+      mapDisabled: true,
+      otherMapShow: false,
+      mapValue: '',
+      otherMapValue: ''
+    }
+  }
+
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .dept-div{
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: calc(100vh - 240px);
+      }
+    }
+  }
+  .inputUpDown{
+    margin: 20px 0;
+  }
+</style>

diff --git a/public/config/project.config.json b/public/config/project.config.json
index 1b2796d..2e9b76b 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "https://38911d91v5.zicp.fun/",
+  "baseUrl": "http://192.168.83.40:11309",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index 689b6b1..c2e7978 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -10,7 +10,14 @@
     params
   })
 }
-
+// 报警类型
+export function alarmType(params) {
+  return request({
+    url: '/sys/dict/code/alarmType',
+    method: 'get',
+    params
+  })
+}
 // 添加字典
 export function addDict(data) {
   return request({
diff --git a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
index dba4aa9..8fbaa64 100644
--- a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
+++ b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
@@ -1,13 +1,164 @@
 <template>
-  <div>报警内容配置</div>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.alarmType"
+          size="small"
+          placeholder="报警类型"
+          clearable
+        >
+          <el-option
+            v-for="item in alarmTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.deviceType"
+          size="small"
+          placeholder="设备类型"
+          clearable
+        >
+          <el-option
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+     <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border>
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
+              {{ scope.row[column.value] }}
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+            <el-button type="text" @click="detail(scope.row)">
+              详情
+            </el-button>
+            <el-button type="text" @click="datalist(scope.row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+  </app-container>
 </template>
 
 <script>
+import { alarmType } from '@/api/system/dict'
 export default {
+  data() {
+    return {
+      columns: [
+        {
+          text: '报警内容',
+          value: 'id',
+          align: 'center'
+        },
+        {
+          text: '报警类型',
+          value: 'modelName',
+          align: 'center'
+        },
+        {
+          text: '双倍类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: true, // 加载动画
+      listQuery: {
+        alarmType: '',
+        deviceType: '',
+        offset: 1,
+        limit: 20
+      },
+      alarmTypeList: [],
+      deviceTypeList: []
+    }
+  },
+  mounted() {
+    this.getAlarmType()
+  },
+  methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 获取报警类型
+    getAlarmType() {
+      alarmType().then(response => {
+        console.log(response)
+      })
+    },
+    search() {}
+  }
 
 }
 </script>
 
-<style>
+<style rel="stylesheet/scss" lang="scss" scoped>
 
 </style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
index 28025d3..c7184f4 100644
--- a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
+++ b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
@@ -1,21 +1,31 @@
 <template>
   <app-container>
     <el-row>
-      <el-col :span="4">
+      <!--左半部分-->
+      <el-col :span="5">
         <div class="dept-div">
-          <el-card class="box-card" shadow="always" header="项目">
+          <el-card class="box-card" shadow="always">
             <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <div tabIndex="1">
-                燃气集团项目
-              </div>
-              <div tabIndex="2">
-                亦庄项目
-              </div>
+              <el-input
+                v-model="filterText"
+                clearable
+                placeholder="请输入项目名称"
+              />
+              <el-tree
+                ref="tree"
+                v-loading="treeLoading"
+                :filter-node-method="filterNode"
+                :data="deptTree"
+                :props="defaultProps"
+                :default-expand-all="expandAllNode"
+                :expand-on-click-node="expandNodeClick"
+                @node-click="handleNodeClick"
+              />
             </el-scrollbar>
           </el-card>
         </div>
       </el-col>
-      <el-col :span="20">
+      <el-col :span="19">
         <div>
           <el-row class="table-title">
             <el-col :span="6">
@@ -29,8 +39,16 @@
               </el-button>
             </el-col>
           </el-row>
-          <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-            <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <el-table v-loading="listLoading" :data="list" class="table" border>
+            <el-table-column :index="indexMethod" align="center" type="index" />
+            <el-table-column
+              v-for="column in columns"
+              :key="column.value"
+              :label="column.text"
+              :width="column.width"
+              :align="column.align"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
                 <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
@@ -73,43 +91,144 @@
 </template>
 
 <script>
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 export default {
   data() {
-    return {}
+    return {
+      listQuery: {
+        offset: 1,
+        limit: 20
+      }, // 查询条件
+      columns: [
+        {
+          text: '监控指标',
+          value: 'id',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'modelName',
+          align: 'center'
+        },
+        {
+          text: '开启报警',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '开启工单',
+          value: 'communNameGroup',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: true, // 加载动画
+      treeLoading: false,
+      deptTree: null,
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      filterText: '',
+      expandAllNode: true,
+      expandNodeClick: false
+    }
   },
-  methods: {}
+  watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val)
+    }
+  },
+  mounted() {
+    this.fetchDeptTree()
+  },
+  methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    filterNode(value, data) {
+      if (!value) return true
+      return data.name.indexOf(value) !== -1
+    },
+    // 获取组织结构树
+    fetchDeptTree() {
+      this.treeLoading = true
+      getDeptTreeList(this.listQuery).then(response => {
+        this.deptTree = toTreeList(response.data, '0', true)
+        this.treeLoading = false
+      })
+    },
+    // 点击左侧组织结构项触发
+    handleNodeClick(val) {
+      console.log(val)
+      this.headerValue = val.name
+      this.listQuery.deptId = val.id
+    }
+  }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+  .titleHeadStyle{
+    font-weight: 600;
+    margin: 20px 0;
+  }
+  .titleStyle{
+    margin: 20px;
+    font-weight: 600;
+  }
+  .buttonGroup{
+    margin: 20px;
+  }
   .dept-div{
     padding-right: 12px;
     .box-card{
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: 300px;
-        div{
-          text-align: center;
-          margin: 20px 0;
-          cursor: pointer;
-          padding: 10px;
-          i {
-            margin-right: 10px;
-          }
-        }
+        height: calc(100vh - 204px);
+      }
+      .el-input{
+        margin-bottom: 20px;
       }
     }
   }
-  .user-dept-scroll div:focus{
-    color: gray;
-    background: rgb(242, 238, 238);
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
   }
-  .user-dept-scroll div:hover{
-    color: gray;
-    background: rgb(242, 238, 238);
+  .pagination-container{
+    margin-bottom: 50px;
   }
-  .headerTeam{
-    font-size: 20px;
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
   }
 </style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
index 8303dc4..543d944 100644
--- a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
@@ -1,8 +1,5 @@
 <template>
   <div>
-    <div class="heardTitle">
-      报警推送配置
-    </div>
     <el-form
       ref="dataForm"
       :rules="rules"
@@ -91,13 +88,13 @@
       </el-row>
     </el-form>
     <div>
-      <el-button size="small" @click="up">
+      <el-button size="small" @click="updata">
         修改
       </el-button>
       <el-button size="small" @click="saveData">
         保存
       </el-button>
-      <el-button size="small" @click="dialogFormVisible = false">
+      <el-button size="small" @click="dialogStatus = true">
         取消
       </el-button>
     </div>
@@ -125,6 +122,7 @@
     }
   },
   methods: {
+    updata() {},
     saveData() {}
   }
 }
@@ -136,8 +134,4 @@
 .el-row{
     margin-left: 20px;
 }
-.heardTitle{
-    margin: 10px 0;
-    font-weight: 600;
-}
 </style>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 7ce996e..93e9c8e 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -1,44 +1,19 @@
 <template>
   <app-container>
-    <el-row>
-      <!--左半部分-->
-      <el-col :span="4">
-        <div class="dept-div">
-          <el-card class="box-card" shadow="always">
-            <el-scrollbar class="user-dept-scroll">
-              <el-menu
-                default-active="1"
-                class="el-menu-vertical-demo"
-                @select="selectMenu"
-              >
-                <el-menu-item index="1">
-                  <i class="el-icon-share" />
-                  <span slot="title">报警推送配置</span>
-                </el-menu-item>
-                <el-menu-item index="2">
-                  <i class="el-icon-upload" />
-                  <span slot="title">报警等级配置</span>
-                </el-menu-item>
-                <el-menu-item index="3">
-                  <i class="el-icon-copy-document" />
-                  <span slot="title">报警内容配置</span>
-                </el-menu-item>
-              </el-menu>
-            </el-scrollbar>
-          </el-card>
-        </div>
-      </el-col>
-      <!--右半部分-->
-      <el-col :span="20">
-        <el-card>
-          <el-scrollbar class="user-dept-scroll-content">
-            <alarm-push-condig v-if="alarmPushConShow" />
-            <alarm-leven-config v-if="alarmLevenConShow" />
-            <alarm-content-config v-if="alarmContentConShow" />
-          </el-scrollbar>
-        </el-card>
-      </el-col>
-    </el-row>
+    <el-tabs tab-position="left" class="user-dept-scroll">
+      <el-tab-pane>
+        <span slot="label"><i class="el-icon-share" />报警推送配置</span>
+        <alarm-push-condig />
+      </el-tab-pane>
+      <el-tab-pane>
+        <span slot="label"><i class="el-icon-upload" />报警等级配置</span>
+        <alarm-leven-config />
+      </el-tab-pane>
+      <el-tab-pane>
+        <span slot="label"><i class="el-icon-copy-document" />报警内容配置</span>
+        <alarm-content-config />
+      </el-tab-pane>
+    </el-tabs>
   </app-container>
 </template>
 
@@ -52,62 +27,18 @@
   components: { alarmPushCondig, alarmLevenConfig, alarmContentConfig },
   data() {
     return {
-      alarmPushConShow: true,
-      alarmLevenConShow: false,
-      alarmContentConShow: false
     }
   },
   mounted() {
   },
   methods: {
-    selectMenu(val) {
-      console.log(val)
-      if (val === '1') {
-        this.alarmPushConShow = true
-        this.alarmLevenConShow = false
-        this.alarmContentConShow = false
-      } else if (val === '2') {
-        this.alarmPushConShow = false
-        this.alarmLevenConShow = true
-        this.alarmContentConShow = false
-      } else if (val === '3') {
-        this.alarmPushConShow = false
-        this.alarmLevenConShow = false
-        this.alarmContentConShow = true
-      }
-    }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .dept-div{
-    padding-right: 12px;
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 640px);
-        div{
-          text-align: center;
-          margin: 20px 0;
-          cursor: pointer;
-          padding: 10px;
-          i {
-            margin-right: 10px;
-          }
-        }
-      }
-    }
-  }
-  .user-dept-scroll-content{
-    height: calc(100vh - 200px);
-  }
-</style>
-<style>
-  .dept-div .el-scrollbar__wrap{
-    overflow-x: auto;
-    background-color: #fff;
-    padding: 0px;
+  .user-dept-scroll{
+    width: 100%;
+    height: calc(100vh - 160px);
   }
 </style>
diff --git a/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue b/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
deleted file mode 100644
index 3f32389..0000000
--- a/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
+++ /dev/null
@@ -1,302 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="通讯方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              :disabled="dialogStatus === 'detail' ? true : false"
-              placeholder="请选择支持通信方式"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="默认坐标系" prop="coordinateType">
-            <el-input
-              v-model="deviceForm.coordinateType"
-              placeholder="请输入数据默认坐标系"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="生成工单" prop="isJobGenerate">
-            <el-select
-              v-model="deviceForm.isJobGenerate"
-              clearable
-              placeholder="请选择是否生成工单"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in jobList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="APP推送" prop="isAppPush">
-            <el-select
-              v-model="deviceForm.isAppPush"
-              clearable
-              placeholder="请选择是否APP推送"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in appPushList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="平台地址" prop="address">
-            <el-input
-              v-model="deviceForm.address"
-              placeholder="请输入平台地址"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="应用名称" prop="planName">
-            <el-input
-              v-model="deviceForm.planName"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              placeholder="请输入应用名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="APPID" prop="APPID">
-            <el-input
-              v-model="deviceForm.APPID"
-              placeholder="请输入APPID"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="APPKEY" prop="APPKEY">
-            <el-input
-              v-model="deviceForm.APPKEY"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              placeholder="请输入APPKEY"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { updateAlarmContent } from '@/api/systemConfig/tenantConfig'
-export default {
-  name: 'EditTenantConfig',
-  data() {
-    return {
-      // 通讯方式
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 是否生成工单
-      jobList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      // 是否开启App推送
-      appPushList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        communication: [],
-        coordinateType: '',
-        isJobGenerate: '',
-        isAppPush: '',
-        planName: '',
-        address: '',
-        APPID: '',
-        APPKEY: ''
-      },
-      // 表单校验规则
-      rules: {
-        communication: [{ required: true, message: '支持通讯方式必选', trigger: ['blur', 'change'] }],
-        coordinateType: [{ required: true, message: '坐标系不能为空', trigger: ['blur', 'change'] }],
-        isJobGenerate: [{ required: true, message: '是否生成工单必选', trigger: ['blur', 'change'] }],
-        isAppPush: [{ required: true, message: '是否开启APP推送必选', trigger: ['blur', 'change'] }],
-        address: [{ required: true, message: '平台地址不能为空', trigger: ['blur', 'change'] }],
-        planName: [{ required: true, message: '应用名称不能为空', trigger: ['blur', 'change'] }],
-        APPID: [{ required: true, message: 'APPID不能为空', trigger: ['blur', 'change'] }],
-        APPKEY: [{ required: true, message: 'APPKEY不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        communication: [],
-        coordinateType: '',
-        isJobGenerate: '',
-        isAppPush: '',
-        planName: '',
-        address: '',
-        APPID: '',
-        APPKEY: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          communication: row.communication.split(','),
-          coordinateType: row.coordinateType,
-          isJobGenerate: row.isJobGenerate,
-          isAppPush: row.isAppPush,
-          planName: row.planName,
-          address: row.address,
-          APPID: row.address,
-          APPKEY: row.APPKEY
-        }
-      }
-    },
-    // 修改数据
-    saveData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/systemConfig/tenantConfig/tenantConfig.vue b/src/views/systemConfig/tenantConfig/tenantConfig.vue
index 021f45f..898bf74 100644
--- a/src/views/systemConfig/tenantConfig/tenantConfig.vue
+++ b/src/views/systemConfig/tenantConfig/tenantConfig.vue
@@ -5,13 +5,16 @@
       <el-col :span="5">
         <div class="dept-div">
           <el-card class="box-card" shadow="always">
-            <div slot="header">
-              <span>项目名称</span>
-            </div>
             <el-scrollbar ref="deptScroll" class="user-dept-scroll">
+              <el-input
+                v-model="filterText"
+                clearable
+                placeholder="请输入项目名称"
+              />
               <el-tree
-                ref="tree2"
+                ref="tree"
                 v-loading="treeLoading"
+                :filter-node-method="filterNode"
                 :data="deptTree"
                 :props="defaultProps"
                 :default-expand-all="expandAllNode"
@@ -24,103 +27,208 @@
       </el-col>
       <!--右半部分-->
       <el-col :span="19">
-        <!--筛选条件-->
-        <search-area size="small" @search="search">
-          <search-item>
-            <el-input
-              v-model="listQuery.tenantName"
-              size="small"
-              clearable
-              placeholder="请输入项目名称"
-            />
-          </search-item>
-        </search-area>
-        <el-row class="table-title">
-          <el-col :span="6">
-            <div class="title-header">
-              <i class="el-icon-menu" />{{ headerValue }}
-            </div>
-          </el-col>
-          <el-col :span="12" :offset="6" class="edit_btns">
-            <el-button
-              class="edit_btn"
-              size="small"
-              @click="add"
-            >
-              新增
-            </el-button>
-          </el-col>
-        </el-row>
-        <el-table :data="list">
-          <el-table-column label="通讯协议" align="center" />
-          <el-table-column label="默认坐标系" align="center" />
-          <el-table-column label="经度" align="center" />
-          <el-table-column label="维度" align="center" />
-          <el-table-column label="生成工单" align="center" />
-          <el-table-column label="APP推送" align="center" />
-          <el-table-column label="NB平台配置" align="center">
-            <el-table-column label="平台地址" align="center" />
-            <el-table-column label="应用名称" align="center" />
-            <el-table-column label="APPID" align="center" />
-            <el-table-column label="APPKEY" align="center" />
-          </el-table-column>
-          <el-table-column label="操作" align="center">
-            <template slot-scope="scope">
-              <el-button type="text" @click="edit(scope.row)">
-                编辑
-              </el-button>
-              <el-button type="text" @click="detail(scope.row)">
-                详情
-              </el-button>
-              <el-button type="text" @click="del(scope.row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+        <el-form
+          ref="dataForm"
+          :rules="rules"
+          :model="listQuery"
+          label-well-code="right"
+          label-width="100px"
+        >
+          <div class="titleHeadStyle">
+            <div>{{ headerValue }}</div>
+          </div>
+          <div class="titleStyle">
+            基础配置
+          </div>
+          <el-row :gutter="10">
+            <el-col :span="20">
+              <el-col :span="10">
+                <el-form-item label="经度" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入经度"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="纬度" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入纬度"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="20">
+              <el-col :span="10">
+                <el-form-item label="生产工单" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请选择是否生产工单"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="APP推送" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请选择是否是否APP推送"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="20">
+              <el-col :span="10">
+                <el-form-item label="通讯协议" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入通讯协议"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="默认坐标系" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入默认坐标系"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-col>
+          </el-row>
+          <div class="titleStyle">
+            NB平台配置
+          </div>
+          <el-row :gutter="10">
+            <el-col :span="20">
+              <el-col :span="10">
+                <el-form-item label="APPID" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入APPID"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="APPKEY" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入APPKEY"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="20">
+              <el-col :span="10">
+                <el-form-item label="平台地址" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入平台地址"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="应用名称" prop="devcode">
+                  <el-input
+                    v-model.trim="listQuery.devcode"
+                    clearable
+                    size="small"
+                    type="text"
+                    placeholder="请输入应用名称"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div class="buttonGroup">
+          <el-button size="small" @click="saveData">
+            保存
+          </el-button>
+          <el-button size="small" @click="cencel">
+            取消
+          </el-button>
+        </div>
       </el-col>
     </el-row>
-    <edit-tenant-config ref="editTenantConfig" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
-import editTenantConfig from '@/views/systemConfig/tenantConfig/components/editTenantConfig'
 // import { alarmTenantList, delAlarmTenant } from '@/api/systemConfig/tenantConfig'
 export default {
   name: 'TenantConfig',
-  components: { editTenantConfig },
   data() {
     return {
-      treeLoading: false,
-      deptTree: null,
       headerValue: null,
       list: [],
+      treeLoading: false,
+      deptTree: null,
       defaultProps: {
         children: 'children',
         label: 'name'
       },
+      filterText: '',
       expandAllNode: true,
       expandNodeClick: false,
       listQuery: {
-        tenantName: '',
-        keywords: '',
-        beginTime: '',
-        endTime: '',
-        deptId: '',
-        offset: 1,
-        limit: 20,
-        sort: 'id'
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }]
       }
     }
   },
+  watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val)
+    }
+  },
   mounted() {
     this.fetchDeptTree()
     this.fetchData()
   },
   methods: {
+    filterNode(value, data) {
+      if (!value) return true
+      return data.name.indexOf(value) !== -1
+    },
     search() {},
     // 获取组织结构树
     fetchDeptTree() {
@@ -139,30 +247,49 @@
     // 获取用户数据
     fetchData() {
     },
-    // 新增
-    add() {
-      this.$refs.editTenantConfig.initDialog('create')
+    // 保存
+    saveData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          // updateDeviceModel(this.deviceForm).then(response => {
+          //   if (response.code === 200) {
+          //     this.$message.success('修改成功')
+          //     this.$emit('watchChild')
+          //     this.dialogFormVisible = false
+          //   }
+          // })
+        }
+      })
     },
-    // 修改
-    edit(row) {
-      this.$refs.editTenantConfig.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.editTenantConfig.initDialog('detail', row)
+    // 取消
+    cencel() {
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+  .titleHeadStyle{
+    font-weight: 600;
+    margin: 20px 0;
+  }
+  .titleStyle{
+    margin: 20px;
+    font-weight: 600;
+  }
+  .buttonGroup{
+    margin: 20px;
+  }
   .dept-div{
     padding-right: 12px;
     .box-card{
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: calc(100vh - 260px);
+        height: calc(100vh - 200px);
+      }
+      .el-input{
+        margin-bottom: 20px;
       }
     }
   }
diff --git a/src/views/systemConfig/viewsConfig/components/appConfig.vue b/src/views/systemConfig/viewsConfig/components/appConfig.vue
new file mode 100644
index 0000000..cdc75c9
--- /dev/null
+++ b/src/views/systemConfig/viewsConfig/components/appConfig.vue
@@ -0,0 +1,185 @@
+<template>
+  <div>
+    <div class="dept-div">
+      <el-card class="box-card" shadow="hover">
+        <el-scrollbar ref="deptScroll" class="user-dept-scroll">
+          <el-col :span="8">
+            <el-card>
+              <div>标题文字：</div>
+              <div class="inputUpDown">
+                <el-input v-model="titleValue" clearable :disabled="titleDisabled" />
+              </div>
+              <div>
+                <el-button size="small" @click="titleUpData">
+                  修改
+                </el-button>
+                <el-button size="small" @click="titleSure">
+                  保存
+                </el-button>
+                <el-button size="small" @click="titleDisabled = true">
+                  取消
+                </el-button>
+              </div>
+            </el-card>
+            <el-card>
+              <div>登录页文字：</div>
+              <div class="inputUpDown">
+                <el-input v-model="loginTitleValue" clearable :disabled="loginDisabled" />
+              </div>
+              <div>
+                <el-button size="small" @click="loginUpdata">
+                  修改
+                </el-button>
+                <el-button size="small" @click="loginSure">
+                  保存
+                </el-button>
+                <el-button size="small" @click="loginDisabled = true">
+                  取消
+                </el-button>
+              </div>
+            </el-card>
+            <el-card>
+              <div>地图：</div>
+              <div class="inputUpDown">
+                <el-select v-model="mapValue" clearable :disabled="mapDisabled">
+                  <el-option label="高德地图" value="1" />
+                  <el-option label="百度地图" value="2" />
+                  <el-option label="天地图" value="3" />
+                  <el-option label="其他地图" value="4" />
+                </el-select>
+                <el-input v-if="otherMapShow" v-model="otherMapValue" placeholder="请输入地址" />
+              </div>
+              <div>
+                <el-button size="small" @click="mapUpdata">
+                  修改
+                </el-button>
+                <el-button size="small" @click="mapSure">
+                  保存
+                </el-button>
+                <el-button size="small" @click="mapCencel">
+                  取消
+                </el-button>
+              </div>
+            </el-card>
+          </el-col>
+          <el-col :span="16">
+            <el-col>
+              <el-card header="浏览器页签: 页签Logo(图片不能超过200KB)">
+                <el-upload
+                  ref="upload"
+                  :before-upload="handleBeforeUpload"
+                  :on-preview="handlePictureCardPreview"
+                  :on-remove="handleRemove"
+                  :on-exceed="handleExceed"
+                  :on-change="handleChange"
+                  :http-request="uploadFile"
+                  :file-list="imageList"
+                  :limit="4"
+                  :class="{hide:hideUpload}"
+                  multiple
+                  action="string"
+                  accept=".jpg,.jpeg,.png "
+                  list-type="picture-card"
+                >
+                  <i class="el-icon-plus" />
+                </el-upload>
+                <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
+                  <div class="imgBox">
+                    <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto;">
+                  </div>
+                </el-dialog>
+              </el-card>
+            </el-col>
+            <el-col>
+              <el-card header="标题: 系统Logo(图片不能超过200KB)">
+                <el-upload
+                  ref="upload"
+                  :before-upload="handleBeforeUpload"
+                  :on-preview="handlePictureCardPreview"
+                  :on-remove="handleRemove"
+                  :on-exceed="handleExceed"
+                  :on-change="handleChange"
+                  :http-request="uploadFile"
+                  :file-list="imageList"
+                  :limit="4"
+                  :class="{hide:hideUpload}"
+                  multiple
+                  action="string"
+                  accept=".jpg,.jpeg,.png "
+                  list-type="picture-card"
+                >
+                  <i class="el-icon-plus" />
+                </el-upload>
+                <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
+                  <div class="imgBox">
+                    <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto;">
+                  </div>
+                </el-dialog>
+              </el-card>
+            </el-col>
+            <el-col>
+              <el-card header="登录页: 登录页Logo(图片不能超过200KB)">
+                <el-upload
+                  ref="upload"
+                  :before-upload="handleBeforeUpload"
+                  :on-preview="handlePictureCardPreview"
+                  :on-remove="handleRemove"
+                  :on-exceed="handleExceed"
+                  :on-change="handleChange"
+                  :http-request="uploadFile"
+                  :file-list="imageList"
+                  :limit="4"
+                  :class="{hide:hideUpload}"
+                  multiple
+                  action="string"
+                  accept=".jpg,.jpeg,.png "
+                  list-type="picture-card"
+                >
+                  <i class="el-icon-plus" />
+                </el-upload>
+                <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
+                  <div class="imgBox">
+                    <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto;">
+                  </div>
+                </el-dialog>
+              </el-card>
+            </el-col>
+          </el-col>
+        </el-scrollbar>
+      </el-card>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      titleValue: '',
+      loginTitleValue: '',
+      titleDisabled: true,
+      loginDisabled: true,
+      mapDisabled: true,
+      otherMapShow: false,
+      mapValue: '',
+      otherMapValue: ''
+    }
+  }
+
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .dept-div{
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: calc(100vh - 240px);
+      }
+    }
+  }
+  .inputUpDown{
+    margin: 20px 0;
+  }
+</style>
diff --git a/src/views/systemConfig/viewsConfig/components/pcConfig.vue b/src/views/systemConfig/viewsConfig/components/pcConfig.vue
new file mode 100644
index 0000000..cdc75c9
--- /dev/null
+++ b/src/views/systemConfig/viewsConfig/components/pcConfig.vue
@@ -0,0 +1,185 @@
+<template>
+  <div>
+    <div class="dept-div">
+      <el-card class="box-card" shadow="hover">
+        <el-scrollbar ref="deptScroll" class="user-dept-scroll">
+          <el-col :span="8">
+            <el-card>
+              <div>标题文字：</div>
+              <div class="inputUpDown">
+                <el-input v-model="titleValue" clearable :disabled="titleDisabled" />
+              </div>
+              <div>
+                <el-button size="small" @click="titleUpData">
+                  修改
+                </el-button>
+                <el-button size="small" @click="titleSure">
+                  保存
+                </el-button>
+                <el-button size="small" @click="titleDisabled = true">
+                  取消
+                </el-button>
+              </div>
+            </el-card>
+            <el-card>
+              <div>登录页文字：</div>
+              <div class="inputUpDown">
+                <el-input v-model="loginTitleValue" clearable :disabled="loginDisabled" />
+              </div>
+              <div>
+                <el-button size="small" @click="loginUpdata">
+                  修改
+                </el-button>
+                <el-button size="small" @click="loginSure">
+                  保存
+                </el-button>
+                <el-button size="small" @click="loginDisabled = true">
+                  取消
+                </el-button>
+              </div>
+            </el-card>
+            <el-card>
+              <div>地图：</div>
+              <div class="inputUpDown">
+                <el-select v-model="mapValue" clearable :disabled="mapDisabled">
+                  <el-option label="高德地图" value="1" />
+                  <el-option label="百度地图" value="2" />
+                  <el-option label="天地图" value="3" />
+                  <el-option label="其他地图" value="4" />
+                </el-select>
+                <el-input v-if="otherMapShow" v-model="otherMapValue" placeholder="请输入地址" />
+              </div>
+              <div>
+                <el-button size="small" @click="mapUpdata">
+                  修改
+                </el-button>
+                <el-button size="small" @click="mapSure">
+                  保存
+                </el-button>
+                <el-button size="small" @click="mapCencel">
+                  取消
+                </el-button>
+              </div>
+            </el-card>
+          </el-col>
+          <el-col :span="16">
+            <el-col>
+              <el-card header="浏览器页签: 页签Logo(图片不能超过200KB)">
+                <el-upload
+                  ref="upload"
+                  :before-upload="handleBeforeUpload"
+                  :on-preview="handlePictureCardPreview"
+                  :on-remove="handleRemove"
+                  :on-exceed="handleExceed"
+                  :on-change="handleChange"
+                  :http-request="uploadFile"
+                  :file-list="imageList"
+                  :limit="4"
+                  :class="{hide:hideUpload}"
+                  multiple
+                  action="string"
+                  accept=".jpg,.jpeg,.png "
+                  list-type="picture-card"
+                >
+                  <i class="el-icon-plus" />
+                </el-upload>
+                <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
+                  <div class="imgBox">
+                    <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto;">
+                  </div>
+                </el-dialog>
+              </el-card>
+            </el-col>
+            <el-col>
+              <el-card header="标题: 系统Logo(图片不能超过200KB)">
+                <el-upload
+                  ref="upload"
+                  :before-upload="handleBeforeUpload"
+                  :on-preview="handlePictureCardPreview"
+                  :on-remove="handleRemove"
+                  :on-exceed="handleExceed"
+                  :on-change="handleChange"
+                  :http-request="uploadFile"
+                  :file-list="imageList"
+                  :limit="4"
+                  :class="{hide:hideUpload}"
+                  multiple
+                  action="string"
+                  accept=".jpg,.jpeg,.png "
+                  list-type="picture-card"
+                >
+                  <i class="el-icon-plus" />
+                </el-upload>
+                <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
+                  <div class="imgBox">
+                    <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto;">
+                  </div>
+                </el-dialog>
+              </el-card>
+            </el-col>
+            <el-col>
+              <el-card header="登录页: 登录页Logo(图片不能超过200KB)">
+                <el-upload
+                  ref="upload"
+                  :before-upload="handleBeforeUpload"
+                  :on-preview="handlePictureCardPreview"
+                  :on-remove="handleRemove"
+                  :on-exceed="handleExceed"
+                  :on-change="handleChange"
+                  :http-request="uploadFile"
+                  :file-list="imageList"
+                  :limit="4"
+                  :class="{hide:hideUpload}"
+                  multiple
+                  action="string"
+                  accept=".jpg,.jpeg,.png "
+                  list-type="picture-card"
+                >
+                  <i class="el-icon-plus" />
+                </el-upload>
+                <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
+                  <div class="imgBox">
+                    <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto;">
+                  </div>
+                </el-dialog>
+              </el-card>
+            </el-col>
+          </el-col>
+        </el-scrollbar>
+      </el-card>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      titleValue: '',
+      loginTitleValue: '',
+      titleDisabled: true,
+      loginDisabled: true,
+      mapDisabled: true,
+      otherMapShow: false,
+      mapValue: '',
+      otherMapValue: ''
+    }
+  }
+
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .dept-div{
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: calc(100vh - 240px);
+      }
+    }
+  }
+  .inputUpDown{
+    margin: 20px 0;
+  }
+</style>
diff --git a/src/views/systemConfig/viewsConfig/viewsConfig.vue b/src/views/systemConfig/viewsConfig/viewsConfig.vue
index 802c7ed..8b86590 100644
--- a/src/views/systemConfig/viewsConfig/viewsConfig.vue
+++ b/src/views/systemConfig/viewsConfig/viewsConfig.vue
@@ -1,390 +1,30 @@
 <template>
   <app-container>
-    <el-row :gutter="4">
-      <!--左半部分-->
-      <el-col :span="12">
-        <div class="dept-div">
-          <el-card class="box-card" shadow="hover">
-            <div class="heardStyle">
-              <span><i class="el-icon-s-platform" /></span>
-              <span>PC端</span>
-            </div>
-            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-col :span="8">
-                <el-card>
-                  <div>标题文字：</div>
-                  <div class="inputUpDown">
-                    <el-input v-model="titleValue" clearable :disabled="titleDisabled" />
-                  </div>
-                  <div>
-                    <el-button size="small" @click="titleUpData">
-                      修改
-                    </el-button>
-                    <el-button size="small" @click="titleSure">
-                      保存
-                    </el-button>
-                    <el-button size="small" @click="titleDisabled = true">
-                      取消
-                    </el-button>
-                  </div>
-                </el-card>
-                <el-card>
-                  <div>登录页文字：</div>
-                  <div class="inputUpDown">
-                    <el-input v-model="loginTitleValue" clearable :disabled="loginDisabled" />
-                  </div>
-                  <div>
-                    <el-button size="small" @click="loginUpdata">
-                      修改
-                    </el-button>
-                    <el-button size="small" @click="loginSure">
-                      保存
-                    </el-button>
-                    <el-button size="small" @click="loginDisabled = true">
-                      取消
-                    </el-button>
-                  </div>
-                </el-card>
-                <el-card>
-                  <div>地图：</div>
-                  <div class="inputUpDown">
-                    <el-select v-model="mapValue" clearable :disabled="mapDisabled">
-                      <el-option label="高德地图" value="1" />
-                      <el-option label="百度地图" value="2" />
-                      <el-option label="天地图" value="3" />
-                      <el-option label="其他地图" value="4" />
-                    </el-select>
-                    <el-input v-if="otherMapShow" v-model="otherMapValue" placeholder="请输入地址" />
-                  </div>
-                  <div>
-                    <el-button size="small" @click="mapUpdata">
-                      修改
-                    </el-button>
-                    <el-button size="small" @click="mapSure">
-                      保存
-                    </el-button>
-                    <el-button size="small" @click="mapCencel">
-                      取消
-                    </el-button>
-                  </div>
-                </el-card>
-              </el-col>
-              <el-col :span="16">
-                <el-col>
-                  <el-card header="浏览器页签: 页签Logo(图片不能超过200KB)">
-                    <el-upload
-                      ref="upload"
-                      :before-upload="handleBeforeUpload"
-                      :on-preview="handlePictureCardPreview"
-                      :on-remove="handleRemove"
-                      :on-exceed="handleExceed"
-                      :on-change="handleChange"
-                      :http-request="uploadFile"
-                      :file-list="imageList"
-                      :limit="4"
-                      :class="{hide:hideUpload}"
-                      multiple
-                      action="string"
-                      accept=".jpg,.jpeg,.png "
-                      list-type="picture-card"
-                    >
-                      <i class="el-icon-plus" />
-                    </el-upload>
-                    <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
-                      <div class="imgBox">
-                        <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto;">
-                      </div>
-                    </el-dialog>
-                  </el-card>
-                </el-col>
-                <el-col>
-                  <el-card header="标题: 系统Logo(图片不能超过200KB)">
-                    <el-upload
-                      ref="upload"
-                      :before-upload="handleBeforeUpload"
-                      :on-preview="handlePictureCardPreview"
-                      :on-remove="handleRemove"
-                      :on-exceed="handleExceed"
-                      :on-change="handleChange"
-                      :http-request="uploadFile"
-                      :file-list="imageList"
-                      :limit="4"
-                      :class="{hide:hideUpload}"
-                      multiple
-                      action="string"
-                      accept=".jpg,.jpeg,.png "
-                      list-type="picture-card"
-                    >
-                      <i class="el-icon-plus" />
-                    </el-upload>
-                    <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
-                      <div class="imgBox">
-                        <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto;">
-                      </div>
-                    </el-dialog>
-                  </el-card>
-                </el-col>
-                <el-col>
-                  <el-card header="登录页: 登录页Logo(图片不能超过200KB)">
-                    <el-upload
-                      ref="upload"
-                      :before-upload="handleBeforeUpload"
-                      :on-preview="handlePictureCardPreview"
-                      :on-remove="handleRemove"
-                      :on-exceed="handleExceed"
-                      :on-change="handleChange"
-                      :http-request="uploadFile"
-                      :file-list="imageList"
-                      :limit="4"
-                      :class="{hide:hideUpload}"
-                      multiple
-                      action="string"
-                      accept=".jpg,.jpeg,.png "
-                      list-type="picture-card"
-                    >
-                      <i class="el-icon-plus" />
-                    </el-upload>
-                    <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
-                      <div class="imgBox">
-                        <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto;">
-                      </div>
-                    </el-dialog>
-                  </el-card>
-                </el-col>
-              </el-col>
-            </el-scrollbar>
-          </el-card>
-        </div>
-      </el-col>
-      <!--右半部分-->
-      <el-col :span="12">
-        <div class="dept-div">
-          <el-card class="box-card" shadow="hover">
-            <div class="heardStyle">
-              <span><i class="el-icon-mobile-phone" /></span>
-              <span>APP端</span>
-            </div>
-            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-col :span="8">
-                <el-card>
-                  <div>标题文字：</div>
-                  <div class="inputUpDown">
-                    <el-input v-model="titleValue" clearable :disabled="titleDisabled" />
-                  </div>
-                  <div>
-                    <el-button size="small" @click="titleUpData">
-                      修改
-                    </el-button>
-                    <el-button size="small" @click="titleSure">
-                      保存
-                    </el-button>
-                    <el-button size="small" @click="titleDisabled = true">
-                      取消
-                    </el-button>
-                  </div>
-                </el-card>
-                <el-card>
-                  <div>登录页文字：</div>
-                  <div class="inputUpDown">
-                    <el-input v-model="loginTitleValue" clearable :disabled="loginDisabled" />
-                  </div>
-                  <div>
-                    <el-button size="small" @click="loginUpdata">
-                      修改
-                    </el-button>
-                    <el-button size="small" @click="loginSure">
-                      保存
-                    </el-button>
-                    <el-button size="small" @click="loginDisabled = true">
-                      取消
-                    </el-button>
-                  </div>
-                </el-card>
-                <el-card>
-                  <div>地图：</div>
-                  <div class="inputUpDown">
-                    <el-select v-model="mapValue" clearable :disabled="mapDisabled">
-                      <el-option label="高德地图" value="1" />
-                      <el-option label="百度地图" value="2" />
-                      <el-option label="天地图" value="3" />
-                      <el-option label="其他地图" value="4" />
-                    </el-select>
-                    <el-input v-if="otherMapShow" v-model="otherMapValue" placeholder="请输入地址" />
-                  </div>
-                  <div>
-                    <el-button size="small" @click="mapUpdata">
-                      修改
-                    </el-button>
-                    <el-button size="small" @click="mapSure">
-                      保存
-                    </el-button>
-                    <el-button size="small" @click="mapCencel">
-                      取消
-                    </el-button>
-                  </div>
-                </el-card>
-              </el-col>
-              <el-col :span="16">
-                <el-col>
-                  <el-card header="浏览器页签: 页签Logo(图片不能超过200KB)">
-                    <el-upload
-                      ref="upload"
-                      :before-upload="handleBeforeUpload"
-                      :on-preview="handlePictureCardPreview"
-                      :on-remove="handleRemove"
-                      :on-exceed="handleExceed"
-                      :on-change="handleChange"
-                      :http-request="uploadFile"
-                      :file-list="imageList"
-                      :limit="4"
-                      :class="{hide:hideUpload}"
-                      multiple
-                      action="string"
-                      accept=".jpg,.jpeg,.png "
-                      list-type="picture-card"
-                    >
-                      <i class="el-icon-plus" />
-                    </el-upload>
-                    <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
-                      <div class="imgBox">
-                        <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto;">
-                      </div>
-                    </el-dialog>
-                  </el-card>
-                </el-col>
-                <el-col>
-                  <el-card header="标题: 系统Logo(图片不能超过200KB)">
-                    <el-upload
-                      ref="upload"
-                      :before-upload="handleBeforeUpload"
-                      :on-preview="handlePictureCardPreview"
-                      :on-remove="handleRemove"
-                      :on-exceed="handleExceed"
-                      :on-change="handleChange"
-                      :http-request="uploadFile"
-                      :file-list="imageList"
-                      :limit="4"
-                      :class="{hide:hideUpload}"
-                      multiple
-                      action="string"
-                      accept=".jpg,.jpeg,.png "
-                      list-type="picture-card"
-                    >
-                      <i class="el-icon-plus" />
-                    </el-upload>
-                    <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
-                      <div class="imgBox">
-                        <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto;">
-                      </div>
-                    </el-dialog>
-                  </el-card>
-                </el-col>
-                <el-col>
-                  <el-card header="登录页: 登录页Logo(图片不能超过200KB)">
-                    <el-upload
-                      ref="upload"
-                      :before-upload="handleBeforeUpload"
-                      :on-preview="handlePictureCardPreview"
-                      :on-remove="handleRemove"
-                      :on-exceed="handleExceed"
-                      :on-change="handleChange"
-                      :http-request="uploadFile"
-                      :file-list="imageList"
-                      :limit="4"
-                      :class="{hide:hideUpload}"
-                      multiple
-                      action="string"
-                      accept=".jpg,.jpeg,.png "
-                      list-type="picture-card"
-                    >
-                      <i class="el-icon-plus" />
-                    </el-upload>
-                    <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
-                      <div class="imgBox">
-                        <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto;">
-                      </div>
-                    </el-dialog>
-                  </el-card>
-                </el-col>
-              </el-col>
-            </el-scrollbar>
-          </el-card>
-        </div>
-      </el-col>
-    </el-row>
+    <el-tabs tab-position="left" class="user-dept-scroll">
+      <el-tab-pane>
+        <span slot="label"><i class="el-icon-s-platform" />PC端</span>
+        <pc-config />
+      </el-tab-pane>
+      <el-tab-pane>
+        <span slot="label"><i class="el-icon-mobile-phone" />APP端</span>
+        <app-config />
+      </el-tab-pane>
+    </el-tabs>
   </app-container>
 </template>
 
 <script>
+import appConfig from './components/appConfig'
+import pcConfig from './components/pcConfig'
 export default {
   name: 'ViewsConfig',
-  data() {
-    return {
-      titleValue: '',
-      loginTitleValue: '',
-      titleDisabled: true,
-      loginDisabled: true,
-      mapDisabled: true,
-      otherMapShow: false,
-      mapValue: '',
-      otherMapValue: ''
-    }
-  },
-  watch: {
-    mapValue(val) {
-      if (val === '4') {
-        this.otherMapShow = true
-      }
-    }
-  },
-  mounted() {
-  },
-  methods: {
-    titleUpData() {
-      this.titleDisabled = false
-    },
-    titleSure() {
-      this.titleDisabled = true
-    },
-    loginUpdata() {
-      this.loginDisabled = false
-    },
-    loginSure() {
-      this.loginDisabled = true
-    },
-    mapUpdata() {
-      this.mapDisabled = false
-    },
-    mapSure() {
-      this.mapDisabled = true
-      this.otherMapShow = false
-    },
-    mapCencel() {
-      this.mapDisabled = true
-      this.otherMapShow = false
-    }
-
-  }
+  components: { appConfig, pcConfig }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .dept-div{
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 240px);
-      }
-    }
-  }
-  .inputUpDown{
-    margin: 20px 0;
-  }
-  .heardStyle{
-    margin-bottom: 10px;
-  }
-  .heardStyle span{
-    margin-right: 10px;
+  .user-dept-scroll{
+    width: 100%;
+    height: calc(100vh - 160px);
   }
 </style>