diff --git a/src/App.vue b/src/App.vue
index c80ed45..cf24765 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -23,8 +23,4 @@
   color: #2c3e50;
   height: 100%;
 }
-
-.ss {
-  color: ;
-}
 </style>

diff --git a/src/App.vue b/src/App.vue
index c80ed45..cf24765 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -23,8 +23,4 @@
   color: #2c3e50;
   height: 100%;
 }
-
-.ss {
-  color: ;
-}
 </style>
diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index 53fadc2..7f0ac82 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -68,3 +68,41 @@
 .el-textarea .el-input__count {
   background: transparent;
 }
+/****页面通用样式****/
+.page-data {
+  display: flex;
+  flex-direction: column;
+}
+.page-data .page-filter {
+  text-align: left;
+}
+.page-data .page-content,
+.el-dialog__body .page-content {
+  flex: 1;
+  overflow: hidden;
+}
+.page-data .page-content .page-table {
+  height: 100%;
+}
+.page-data .page-content .page-table .red {
+  color: red;
+}
+.page-data-dialog .el-dialog {
+  display: flex;
+  flex-direction: column;
+  height: 60%;
+  max-height: 60%;
+  margin-top: 10vh !important;
+}
+.page-data-dialog .el-dialog__body {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  padding: 20px;
+  overflow-y: auto;
+}
+.page-data-dialog .el-pagination__sizes,
+.page-data-dialog .el-pagination__total,
+.page-data-dialog .el-pagination__jump {
+  display: none;
+}

diff --git a/src/App.vue b/src/App.vue
index c80ed45..cf24765 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -23,8 +23,4 @@
   color: #2c3e50;
   height: 100%;
 }
-
-.ss {
-  color: ;
-}
 </style>
diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index 53fadc2..7f0ac82 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -68,3 +68,41 @@
 .el-textarea .el-input__count {
   background: transparent;
 }
+/****页面通用样式****/
+.page-data {
+  display: flex;
+  flex-direction: column;
+}
+.page-data .page-filter {
+  text-align: left;
+}
+.page-data .page-content,
+.el-dialog__body .page-content {
+  flex: 1;
+  overflow: hidden;
+}
+.page-data .page-content .page-table {
+  height: 100%;
+}
+.page-data .page-content .page-table .red {
+  color: red;
+}
+.page-data-dialog .el-dialog {
+  display: flex;
+  flex-direction: column;
+  height: 60%;
+  max-height: 60%;
+  margin-top: 10vh !important;
+}
+.page-data-dialog .el-dialog__body {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  padding: 20px;
+  overflow-y: auto;
+}
+.page-data-dialog .el-pagination__sizes,
+.page-data-dialog .el-pagination__total,
+.page-data-dialog .el-pagination__jump {
+  display: none;
+}
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 9fe4611..5d045c0 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -1,15 +1,12 @@
 <template>
   <div id="pagetwo">
     <div class="form">
-      <span class="SelectTitle">站点编号/站点名:</span>
       <el-input
         v-model="searchStr"
         placeholder="请输入站点编号或站点名称"
         clearable
         @change="handleChangeSearch"
       ></el-input>
-      <span class="SelectTitle">时间选择:</span>
-
       <el-date-picker
         v-model="startDate"
         value-format="yyyy-MM-dd"
@@ -43,39 +40,20 @@
     </div>
 
     <el-table :data="listExtend" style="width: 100%; height: calc(100% - 82px)">
-      <el-table-column
-        type="index"
-        label="序号"
-        max-
-        width="70"
-      ></el-table-column>
+      <el-table-column type="index" label="序号" width="70"></el-table-column>
       <el-table-column
         prop="stCode"
         label="站点编号"
-        max-width="130"
+        max-width="120"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
         prop="stName"
         label="站点名称"
         show-overflow-tooltip
-        max-width="200"
-      ></el-table-column>
-      <el-table-column
-        prop="createTime"
-        label="站点安装时间"
-        max-width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="person"
-        label="安装人"
         max-width="150"
       ></el-table-column>
-      <el-table-column
-        prop="tt"
-        label="首次数据接入时间"
-        max-width="180"
-      ></el-table-column>
-      <el-table-column label="站点类型" max-width="150">
+      <el-table-column label="站点类型" width="120">
         <template slot-scope="scope">
           <div>
             <span v-if="scope.row.stationType == 0">水质站</span>
@@ -84,7 +62,36 @@
           </div>
         </template></el-table-column
       >
-      <el-table-column label="操作" max-width="150">
+      <el-table-column
+        prop="createTime"
+        label="站点安装时间"
+        max-width="180"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="person"
+        label="安装人"
+        width="120"
+      ></el-table-column>
+      <el-table-column label="关联设备" width="80">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            size="small"
+            v-if="scope.row.equips.length"
+            @click="handleClick('look', scope.row)"
+            >查看设备</el-button
+          >
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="tt"
+        label="首次数据接入时间"
+        max-width="180"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column label="操作" width="80">
         <template slot-scope="scope">
           <el-button
             type="text"
@@ -129,7 +136,7 @@
               class="selectInput"
               size="small"
               v-model="ruleForm.stationType"
-              placeholder="请选择"
+              placeholder="请选择站点类型"
             >
               <el-option
                 class="selectOption"
@@ -141,6 +148,23 @@
             </el-select>
             <span>按实际设备类型选择站点类型</span>
           </el-form-item>
+          <el-form-item label="所属项目" prop="platformCode">
+            <el-select
+              class="selectInput"
+              size="small"
+              filterable
+              v-model="ruleForm.platformCode"
+              placeholder="请选择所属项目"
+            >
+              <el-option
+                class="selectOption"
+                v-for="item in projectList"
+                :key="item.id"
+                :label="item.key"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="所属区域" prop="area">
             <el-cascader
               ref="cascader"
@@ -149,6 +173,7 @@
               v-model="ruleForm.area"
               :options="syscityList"
               filterable
+              placeholder="请选择所属区域"
               :props="syscityListProps"
               @change="handleChange"
               @visible-change="visiblechange"
@@ -238,7 +263,28 @@
         <el-button type="primary" @click="saveOru('ruleForm')">保存</el-button>
       </span>
     </el-dialog>
-
+    <!--关联设备弹窗-->
+    <page-dialog
+      class="page-data-dialog"
+      :title="dialogInfo.title[dialogInfo.type]"
+      :visible.sync="dialogInfo.visible"
+      :width="dialogInfo.width"
+      :bt-loading="dialogInfo.btLoading"
+      :bt-list="dialogInfo.btList"
+      @handleClick="handleClick"
+    >
+      <page-table
+        tabIndex
+        :api-url="deviceTableInfo.url"
+        :refresh="deviceTableInfo.refresh"
+        :data.sync="deviceTableInfo.data"
+        :query="deviceFilterInfo.query"
+        :init-curpage="deviceTableInfo.initCurpage"
+        :field-list="deviceTableInfo.fieldList"
+        :handle="deviceTableInfo.handle"
+        @handleClick="handleClick"
+      />
+    </page-dialog>
     <el-pagination
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
@@ -328,6 +374,13 @@
             trigger: "change"
           }
         ],
+        platformCode: [
+          {
+            required: true,
+            message: "请选择所属项目",
+            trigger: "change"
+          }
+        ],
         stName: [
           {
             required: true,
@@ -374,13 +427,119 @@
       value: [],
       // 站点管理/所属区域数组
       syscityList: [],
-      syscityListProps: { checkStrictly: true, value: "id", label: "name" }
+      syscityListProps: { checkStrictly: true, value: "id", label: "name" },
+      //当前用户权限内的项目数据
+      projectList: [],
+      //弹窗相关
+      dialogInfo: {
+        title: {
+          look: "关联设备列表"
+        },
+        width: "60%",
+        visible: false,
+        btLoading: false,
+        type: "",
+        btList: [
+          { label: "关闭", type: "", icon: "", event: "close", show: true }
+        ]
+      },
+      //设备搜索相关
+      deviceFilterInfo: {
+        query: {
+          searchStr: "",
+          startDate: "",
+          endDate: ""
+        },
+        list: [
+          {
+            type: "input",
+            label: "设备名称/编号",
+            value: "searchStr",
+            hideLabel: true
+          },
+          {
+            type: "date",
+            label: "开始时间",
+            value: "startDate",
+            dateType: "date",
+            datePickerOptions: "pickerOptionsStart",
+            hideLabel: true
+          },
+          {
+            type: "date",
+            label: "结束时间",
+            value: "endDate",
+            dateType: "date",
+            datePickerOptions: "pickerOptionsEnd",
+            hideLabel: true
+          },
+          {
+            type: "button",
+            label: "查询",
+            btType: "primary",
+            icon: "",
+            event: "search",
+            show: true
+          },
+          {
+            type: "button",
+            label: "添加设备",
+            btType: "primary",
+            icon: "",
+            event: "create",
+            show: true,
+            has: "m11-3-1"
+          }
+        ]
+      },
+      //设备表格相关
+      deviceTableInfo: {
+        url: "", //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [],
+        fieldList: [
+          { label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
+          {
+            label: "设备描述",
+            value: "equipDesc",
+            minWidth: 150,
+            tooltip: true
+          },
+          {
+            label: "设备厂家",
+            value: "equipFactory",
+            minWidth: 150,
+            tooltip: true
+          },
+          { label: "联系人", value: "contactName", width: 100 },
+          { label: "电话", value: "contactMobile", width: 120 }
+        ],
+        handle: {
+          fixed: "right",
+          label: "操作",
+          width: "80",
+          btList: [
+            {
+              label: "解绑",
+              size: "small",
+              type: "text",
+              event: "remove",
+              show: true,
+              has: "m11-3-3"
+            }
+          ]
+        }
+      },
+      //需要进行操作的站点Code
+      needHandleSiteCode: ""
     };
   },
   mounted() {
     this.getsyscityList();
     this.getlistExtend();
     this.getsityType();
+    this.getCurrentUserProject(); //获取当前用户所绑定的项目
   },
   watch: {
     "ruleForm.area": {
@@ -406,6 +565,12 @@
           this.dialogImageUrl = "";
         }
       }
+    },
+    "dialogInfo.visible"(val) {
+      if (!val) {
+        this.deviceTableInfo.data = [];
+        this.dialogInfo.btLoading = false;
+      }
     }
   },
   methods: {
@@ -523,7 +688,6 @@
     },
     // 获取站点列表
     async getlistExtend() {
-      // console.log(this.TimeValue);
       const { data } = await this.$http.post(this.nozzle.listExtend, {
         current: this.currentPage,
         data: {
@@ -554,7 +718,6 @@
             })
             .then(res => {
               this.yzaddflag = false;
-              this.getlistExtend();
             });
         }
       });
@@ -583,19 +746,18 @@
     // 添加站点
     addform(formName) {
       this.yzaddflag = true;
+      // 获取地区列表
       this.title = "新增站点";
     },
     // 操作里面的修改弹窗
     EditFZ(index, rows) {
       // 获取地区列表
-      // console.log(rows);
       for (let key in rows) {
         if (key === "stationType") {
           rows[key] = rows[key].toString();
         }
         this.ruleForm[key] = rows[key];
       }
-      // console.log(this.ruleForm);
       this.yzaddflag = true;
       this.title = "修改站点";
       this.FenZuflag2type = 2;
@@ -616,9 +778,79 @@
           siteType: "site_type"
         }
       });
-
       this.siteTypeList = data.data;
     },
+    //获取当前用户所绑定的项目
+    getCurrentUserProject() {
+      this.$http
+        .post(this.nozzle.sysPlatformList, {
+          current: 0,
+          size: 0,
+          data: { searchStr: "", startDate: "", endDate: "" }
+        })
+        .then(res => {
+          if (res.data.code === 1) {
+            this.projectList = res.data.data.list.map(item => {
+              return {
+                id: item.id,
+                key: item.name,
+                value: item.platformCode
+              };
+            });
+          }
+        });
+    },
+    //点击事件
+    handleClick(event, data, index) {
+      switch (event) {
+        //查看关联设备
+        case "look":
+          this.dialogInfo.visible = true;
+          this.dialogInfo.type = event;
+          this.deviceTableInfo.data = data.equips;
+          this.needHandleSiteCode = data.stCode;
+          break;
+        //解绑设备与站点
+        case "remove":
+          this.$confirm("此操作将解除设备和站点的绑定关系, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+            .then(res => {
+              const params = {
+                data: {
+                  siteCode: this.needHandleSiteCode,
+                  equipNos: [data.equipNo]
+                }
+              };
+              this.$http
+                .post(this.nozzle.sysEquipRemoveBatch, params)
+                .then(res => {
+                  if (res.data.code === 1 || res.data.code === 200) {
+                    this.deviceTableInfo.data.splice(index, 1);
+                    this.getlistExtend();
+                  }
+                  this.$message({
+                    message: res.data.msg,
+                    type: res.data.code === 1 ? "success" : "error",
+                    showClose: true
+                  });
+                })
+                .catch(e => {
+                  message(e);
+                });
+            })
+            .catch(() => {});
+          break;
+        //关闭
+        case "close":
+          setTimeout(() => {
+            this.dialogInfo.visible = false;
+          }, 0);
+          break;
+      }
+    },
     // 关闭弹框后做的操作
     closedialog(formName) {
       this.$refs["ruleForm"].resetFields();
@@ -648,7 +880,7 @@
       };
       this.$refs.cascader.$refs.panel.activePath = [];
       this.$refs.cascader.$refs.panel.clearCheckedNodes();
-      this.getlistExtend();
+      // this.getlistExtend();
     },
     handleChange(value) {
       // 取选中数组的最后一项的id

diff --git a/src/App.vue b/src/App.vue
index c80ed45..cf24765 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -23,8 +23,4 @@
   color: #2c3e50;
   height: 100%;
 }
-
-.ss {
-  color: ;
-}
 </style>
diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index 53fadc2..7f0ac82 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -68,3 +68,41 @@
 .el-textarea .el-input__count {
   background: transparent;
 }
+/****页面通用样式****/
+.page-data {
+  display: flex;
+  flex-direction: column;
+}
+.page-data .page-filter {
+  text-align: left;
+}
+.page-data .page-content,
+.el-dialog__body .page-content {
+  flex: 1;
+  overflow: hidden;
+}
+.page-data .page-content .page-table {
+  height: 100%;
+}
+.page-data .page-content .page-table .red {
+  color: red;
+}
+.page-data-dialog .el-dialog {
+  display: flex;
+  flex-direction: column;
+  height: 60%;
+  max-height: 60%;
+  margin-top: 10vh !important;
+}
+.page-data-dialog .el-dialog__body {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  padding: 20px;
+  overflow-y: auto;
+}
+.page-data-dialog .el-pagination__sizes,
+.page-data-dialog .el-pagination__total,
+.page-data-dialog .el-pagination__jump {
+  display: none;
+}
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 9fe4611..5d045c0 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -1,15 +1,12 @@
 <template>
   <div id="pagetwo">
     <div class="form">
-      <span class="SelectTitle">站点编号/站点名:</span>
       <el-input
         v-model="searchStr"
         placeholder="请输入站点编号或站点名称"
         clearable
         @change="handleChangeSearch"
       ></el-input>
-      <span class="SelectTitle">时间选择:</span>
-
       <el-date-picker
         v-model="startDate"
         value-format="yyyy-MM-dd"
@@ -43,39 +40,20 @@
     </div>
 
     <el-table :data="listExtend" style="width: 100%; height: calc(100% - 82px)">
-      <el-table-column
-        type="index"
-        label="序号"
-        max-
-        width="70"
-      ></el-table-column>
+      <el-table-column type="index" label="序号" width="70"></el-table-column>
       <el-table-column
         prop="stCode"
         label="站点编号"
-        max-width="130"
+        max-width="120"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
         prop="stName"
         label="站点名称"
         show-overflow-tooltip
-        max-width="200"
-      ></el-table-column>
-      <el-table-column
-        prop="createTime"
-        label="站点安装时间"
-        max-width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="person"
-        label="安装人"
         max-width="150"
       ></el-table-column>
-      <el-table-column
-        prop="tt"
-        label="首次数据接入时间"
-        max-width="180"
-      ></el-table-column>
-      <el-table-column label="站点类型" max-width="150">
+      <el-table-column label="站点类型" width="120">
         <template slot-scope="scope">
           <div>
             <span v-if="scope.row.stationType == 0">水质站</span>
@@ -84,7 +62,36 @@
           </div>
         </template></el-table-column
       >
-      <el-table-column label="操作" max-width="150">
+      <el-table-column
+        prop="createTime"
+        label="站点安装时间"
+        max-width="180"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="person"
+        label="安装人"
+        width="120"
+      ></el-table-column>
+      <el-table-column label="关联设备" width="80">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            size="small"
+            v-if="scope.row.equips.length"
+            @click="handleClick('look', scope.row)"
+            >查看设备</el-button
+          >
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="tt"
+        label="首次数据接入时间"
+        max-width="180"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column label="操作" width="80">
         <template slot-scope="scope">
           <el-button
             type="text"
@@ -129,7 +136,7 @@
               class="selectInput"
               size="small"
               v-model="ruleForm.stationType"
-              placeholder="请选择"
+              placeholder="请选择站点类型"
             >
               <el-option
                 class="selectOption"
@@ -141,6 +148,23 @@
             </el-select>
             <span>按实际设备类型选择站点类型</span>
           </el-form-item>
+          <el-form-item label="所属项目" prop="platformCode">
+            <el-select
+              class="selectInput"
+              size="small"
+              filterable
+              v-model="ruleForm.platformCode"
+              placeholder="请选择所属项目"
+            >
+              <el-option
+                class="selectOption"
+                v-for="item in projectList"
+                :key="item.id"
+                :label="item.key"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="所属区域" prop="area">
             <el-cascader
               ref="cascader"
@@ -149,6 +173,7 @@
               v-model="ruleForm.area"
               :options="syscityList"
               filterable
+              placeholder="请选择所属区域"
               :props="syscityListProps"
               @change="handleChange"
               @visible-change="visiblechange"
@@ -238,7 +263,28 @@
         <el-button type="primary" @click="saveOru('ruleForm')">保存</el-button>
       </span>
     </el-dialog>
-
+    <!--关联设备弹窗-->
+    <page-dialog
+      class="page-data-dialog"
+      :title="dialogInfo.title[dialogInfo.type]"
+      :visible.sync="dialogInfo.visible"
+      :width="dialogInfo.width"
+      :bt-loading="dialogInfo.btLoading"
+      :bt-list="dialogInfo.btList"
+      @handleClick="handleClick"
+    >
+      <page-table
+        tabIndex
+        :api-url="deviceTableInfo.url"
+        :refresh="deviceTableInfo.refresh"
+        :data.sync="deviceTableInfo.data"
+        :query="deviceFilterInfo.query"
+        :init-curpage="deviceTableInfo.initCurpage"
+        :field-list="deviceTableInfo.fieldList"
+        :handle="deviceTableInfo.handle"
+        @handleClick="handleClick"
+      />
+    </page-dialog>
     <el-pagination
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
@@ -328,6 +374,13 @@
             trigger: "change"
           }
         ],
+        platformCode: [
+          {
+            required: true,
+            message: "请选择所属项目",
+            trigger: "change"
+          }
+        ],
         stName: [
           {
             required: true,
@@ -374,13 +427,119 @@
       value: [],
       // 站点管理/所属区域数组
       syscityList: [],
-      syscityListProps: { checkStrictly: true, value: "id", label: "name" }
+      syscityListProps: { checkStrictly: true, value: "id", label: "name" },
+      //当前用户权限内的项目数据
+      projectList: [],
+      //弹窗相关
+      dialogInfo: {
+        title: {
+          look: "关联设备列表"
+        },
+        width: "60%",
+        visible: false,
+        btLoading: false,
+        type: "",
+        btList: [
+          { label: "关闭", type: "", icon: "", event: "close", show: true }
+        ]
+      },
+      //设备搜索相关
+      deviceFilterInfo: {
+        query: {
+          searchStr: "",
+          startDate: "",
+          endDate: ""
+        },
+        list: [
+          {
+            type: "input",
+            label: "设备名称/编号",
+            value: "searchStr",
+            hideLabel: true
+          },
+          {
+            type: "date",
+            label: "开始时间",
+            value: "startDate",
+            dateType: "date",
+            datePickerOptions: "pickerOptionsStart",
+            hideLabel: true
+          },
+          {
+            type: "date",
+            label: "结束时间",
+            value: "endDate",
+            dateType: "date",
+            datePickerOptions: "pickerOptionsEnd",
+            hideLabel: true
+          },
+          {
+            type: "button",
+            label: "查询",
+            btType: "primary",
+            icon: "",
+            event: "search",
+            show: true
+          },
+          {
+            type: "button",
+            label: "添加设备",
+            btType: "primary",
+            icon: "",
+            event: "create",
+            show: true,
+            has: "m11-3-1"
+          }
+        ]
+      },
+      //设备表格相关
+      deviceTableInfo: {
+        url: "", //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [],
+        fieldList: [
+          { label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
+          {
+            label: "设备描述",
+            value: "equipDesc",
+            minWidth: 150,
+            tooltip: true
+          },
+          {
+            label: "设备厂家",
+            value: "equipFactory",
+            minWidth: 150,
+            tooltip: true
+          },
+          { label: "联系人", value: "contactName", width: 100 },
+          { label: "电话", value: "contactMobile", width: 120 }
+        ],
+        handle: {
+          fixed: "right",
+          label: "操作",
+          width: "80",
+          btList: [
+            {
+              label: "解绑",
+              size: "small",
+              type: "text",
+              event: "remove",
+              show: true,
+              has: "m11-3-3"
+            }
+          ]
+        }
+      },
+      //需要进行操作的站点Code
+      needHandleSiteCode: ""
     };
   },
   mounted() {
     this.getsyscityList();
     this.getlistExtend();
     this.getsityType();
+    this.getCurrentUserProject(); //获取当前用户所绑定的项目
   },
   watch: {
     "ruleForm.area": {
@@ -406,6 +565,12 @@
           this.dialogImageUrl = "";
         }
       }
+    },
+    "dialogInfo.visible"(val) {
+      if (!val) {
+        this.deviceTableInfo.data = [];
+        this.dialogInfo.btLoading = false;
+      }
     }
   },
   methods: {
@@ -523,7 +688,6 @@
     },
     // 获取站点列表
     async getlistExtend() {
-      // console.log(this.TimeValue);
       const { data } = await this.$http.post(this.nozzle.listExtend, {
         current: this.currentPage,
         data: {
@@ -554,7 +718,6 @@
             })
             .then(res => {
               this.yzaddflag = false;
-              this.getlistExtend();
             });
         }
       });
@@ -583,19 +746,18 @@
     // 添加站点
     addform(formName) {
       this.yzaddflag = true;
+      // 获取地区列表
       this.title = "新增站点";
     },
     // 操作里面的修改弹窗
     EditFZ(index, rows) {
       // 获取地区列表
-      // console.log(rows);
       for (let key in rows) {
         if (key === "stationType") {
           rows[key] = rows[key].toString();
         }
         this.ruleForm[key] = rows[key];
       }
-      // console.log(this.ruleForm);
       this.yzaddflag = true;
       this.title = "修改站点";
       this.FenZuflag2type = 2;
@@ -616,9 +778,79 @@
           siteType: "site_type"
         }
       });
-
       this.siteTypeList = data.data;
     },
+    //获取当前用户所绑定的项目
+    getCurrentUserProject() {
+      this.$http
+        .post(this.nozzle.sysPlatformList, {
+          current: 0,
+          size: 0,
+          data: { searchStr: "", startDate: "", endDate: "" }
+        })
+        .then(res => {
+          if (res.data.code === 1) {
+            this.projectList = res.data.data.list.map(item => {
+              return {
+                id: item.id,
+                key: item.name,
+                value: item.platformCode
+              };
+            });
+          }
+        });
+    },
+    //点击事件
+    handleClick(event, data, index) {
+      switch (event) {
+        //查看关联设备
+        case "look":
+          this.dialogInfo.visible = true;
+          this.dialogInfo.type = event;
+          this.deviceTableInfo.data = data.equips;
+          this.needHandleSiteCode = data.stCode;
+          break;
+        //解绑设备与站点
+        case "remove":
+          this.$confirm("此操作将解除设备和站点的绑定关系, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+            .then(res => {
+              const params = {
+                data: {
+                  siteCode: this.needHandleSiteCode,
+                  equipNos: [data.equipNo]
+                }
+              };
+              this.$http
+                .post(this.nozzle.sysEquipRemoveBatch, params)
+                .then(res => {
+                  if (res.data.code === 1 || res.data.code === 200) {
+                    this.deviceTableInfo.data.splice(index, 1);
+                    this.getlistExtend();
+                  }
+                  this.$message({
+                    message: res.data.msg,
+                    type: res.data.code === 1 ? "success" : "error",
+                    showClose: true
+                  });
+                })
+                .catch(e => {
+                  message(e);
+                });
+            })
+            .catch(() => {});
+          break;
+        //关闭
+        case "close":
+          setTimeout(() => {
+            this.dialogInfo.visible = false;
+          }, 0);
+          break;
+      }
+    },
     // 关闭弹框后做的操作
     closedialog(formName) {
       this.$refs["ruleForm"].resetFields();
@@ -648,7 +880,7 @@
       };
       this.$refs.cascader.$refs.panel.activePath = [];
       this.$refs.cascader.$refs.panel.clearCheckedNodes();
-      this.getlistExtend();
+      // this.getlistExtend();
     },
     handleChange(value) {
       // 取选中数组的最后一项的id
diff --git a/src/components/ConfigManager/device.vue b/src/components/ConfigManager/device.vue
new file mode 100644
index 0000000..f800811
--- /dev/null
+++ b/src/components/ConfigManager/device.vue
@@ -0,0 +1,297 @@
+<template>
+  <div class="page-data">
+    <!--搜素框-->
+    <div class="page-filter">
+      <page-filter
+        :query.sync="deviceFilterInfo.query"
+        :filter-list="deviceFilterInfo.list"
+        @handleClick="handleClick"
+      />
+    </div>
+    <div class="page-content">
+      <!--表格-->
+      <div class="h-100">
+        <page-table
+          tabIndex
+          pagination
+          :api-url="deviceTableInfo.url"
+          :refresh="deviceTableInfo.refresh"
+          :data.sync="deviceTableInfo.data"
+          :query="deviceFilterInfo.query"
+          :page-query="deviceTableInfo.pageQuery"
+          :list-type-info="listTypeInfo"
+          :init-curpage="deviceTableInfo.initCurpage"
+          :field-list="deviceTableInfo.fieldList"
+          :handle="deviceTableInfo.handle"
+          @handleClick="handleClick"
+        >
+          <template v-slot:col-status="scope">
+            <el-button type="text" size="small" :class="[scope.row.status === 1 ? '' : 'red']">
+              {{ scope.row.status === 1 ? "管理中" : "未管理" }}
+            </el-button>
+          </template>
+        </page-table>
+      </div>
+    </div>
+    <!--弹窗-->
+    <page-dialog
+      :title="dialogInfo.title[dialogInfo.type]"
+      :visible.sync="dialogInfo.visible"
+      :width="dialogInfo.width"
+      :bt-loading="dialogInfo.btLoading"
+      :bt-list="dialogInfo.btList"
+      @handleClick="handleClick"
+    >
+      <page-form
+        :ref-obj.sync="formInfo.ref"
+        :data="formInfo.data"
+        :field-list="formInfo.fieldList"
+        :rules="formInfo.rules"
+        :label-width="formInfo.labelWidth"
+        :list-type-info="listTypeInfo"
+        @handleClick="handleClick"
+      />
+    </page-dialog>
+  </div>
+</template>
+
+<script>
+import { message } from "./../../util/item";
+export default {
+  data() {
+    // 验证电话
+    let checkPhone = (rule, value, callback) => {
+      let check = this.$validate({ label: "电话", value, rules: ["phone"] });
+      if (!check.result) {
+        callback(new Error(check.message));
+      } else {
+        callback();
+      }
+    };
+    return {
+      //设备搜索相关
+      deviceFilterInfo: {
+        query: {
+          searchStr: "",
+          startDate: "",
+          endDate: ""
+        },
+        list: [
+          {type: "input", label: "设备名称/编号", value: "searchStr", hideLabel: true },
+          {type: "date", label: "开始时间", value: "startDate", dateType: "date", datePickerOptions: "pickerOptionsStart", hideLabel: true},
+          {type: "date", label: "结束时间", value: "endDate", dateType: "date", datePickerOptions: "pickerOptionsEnd", hideLabel: true},
+          {type: "button", label: "查询", btType: "primary", icon: "", event: "search", show: true},
+          {type: "button", label: "添加设备", btType: "primary", icon: "", event: "create", show: true, has: "m11-3-1"}
+        ]
+      },
+      //设备表格相关
+      deviceTableInfo: {
+        url: this.nozzle.sysEquipList, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [
+          {equipNo:1000,equipDesc:"3333",equipFactory:'4444'}
+        ],
+        fieldList: [
+          { label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
+          { label: "设备描述", value: "equipDesc", minWidth: 150, tooltip: true },
+          { label: "设备厂家", value: "equipFactory", minWidth: 150, tooltip: true },
+          { label: "厂家简称", value: "equipFactoryAbb", minWidth: 100, tooltip: true },
+          { label: "联系人", value: "contactName", width: 100 },
+          { label: "电话", value: "contactMobile", width: 120 },
+          { label: "站点编号", value: "siteCode", minWidth: 100, tooltip: true },
+          { label: "更新时间", value: "updateTime", minWidth: 150, tooltip: true }
+        ],
+        handle: {
+          fixed: "right",
+          label: "操作",
+          width: "120",
+          btList: [
+            { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-3-2' },
+            { label: "删除", size: "small", type: "text", event: "delete", show: true, has: 'm11-3-3' }
+          ]
+        }
+      },
+      //设备表单相关
+      formInfo: {
+        ref: null,
+        data: {
+          id: undefined,
+          equipNo: "",
+          equipDesc: "",
+          equipFactory: "",
+          equipFactoryAbb: "",
+          contactName: "",
+          contactMobile: "",
+          siteCode: ""
+        },
+        fieldList: [
+          { label: "设备编号", value: "equipNo", type: "input", required: true },
+          { label: "设备描述", value: "equipDesc", type: "input", required: true },
+          { label: "设备厂家", value: "equipFactory", type: "input", required: true },
+          { label: "厂家简称", value: "equipFactoryAbb", type: "input", required: true },
+          { label: "联系人", value: "contactName", type: "input", required: true },
+          { label: "电话", value: "contactMobile", type: "input", required: true, validator: checkPhone },
+          { label: "站点编号", value: "siteCode", type: "select", list: "siteList", filterable:true, required: true },
+        ],
+        rules: {},
+      },
+      //列表相关
+      listTypeInfo:{
+        siteList:[]
+      },
+      //弹窗相关
+      dialogInfo:{
+        title: {
+          update: '编辑设备',
+          create: '添加设备'
+        },
+        width: '500px',
+        visible: false,
+        btLoading: false,
+        type: '',
+        btList: [
+          {label:'关闭',type:'',icon:'',event:'close',show:true},
+          {label:'保存',type:'primary',icon:'',event:'save',show:true,loading:true}
+        ]
+      },
+    }
+  },
+  watch: {
+    "dialogInfo.visible"(val) {
+      if (!val) {
+        if (this.formInfo.ref) {
+          this.formInfo.ref.resetFields();
+        }
+        this.resetForm();
+        this.btnLoading = false;
+      }
+    },
+  },
+  created() {
+    this.initSiteData();
+  },
+  mounted() {
+    this.initRules();
+    this.deviceTableInfo.refresh = Math.random();
+  },
+  methods: {
+    //初始化验证
+    initRules() {
+      const formInfo = this.formInfo;
+      formInfo.rules = this.$initRules(formInfo.fieldList);
+    },
+    //初始化站点数据
+    initSiteData() {
+      this.$http.post(this.nozzle.listExtend, {
+        current: 0,
+        data: {searchStr: "",startDate: "",endDate: ""},
+        size: 0
+      }).then(res =>{
+        if(res.data.code === 1) {
+          this.listTypeInfo.siteList = res.data.data.list.map(item =>{
+            return {
+              key: item.stName,
+              value: item.stCode
+            }
+          })
+        }
+      })
+    },
+    //点击事件
+    handleClick(event, data) {
+      switch (event) {
+        //设备搜索
+        case "search":
+          this.deviceTableInfo.initCurpage = Math.random();
+          this.deviceTableInfo.refresh = Math.random();
+          break;
+        //设备添加按钮
+        case "create":
+          this.dialogInfo.type = event;
+          this.dialogInfo.visible = true;
+          break;
+        //编辑设备按钮
+        case "update":
+          this.dialogInfo.type = event;
+          this.dialogInfo.visible = true;
+          for (let key in data) {
+            if (key in this.formInfo.data) {
+              this.formInfo.data[key] = data[key];
+            }
+          }
+          break;
+        //删除设备按钮
+        case "delete":
+          this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(res =>{
+            this.$http.post(this.nozzle.sysEquipDelete,{data:{equipNo:data.equipNo}}).then(res =>{
+              if(res.data.code === 1 || res.data.code === 200) {
+                this.deviceTableInfo.refresh = Math.random();
+                this.deviceTableInfo.initCurpage = Math.random();
+              }
+              this.$message({
+                message: res.data.msg,
+                type: res.data.code === 1 ? 'success' : 'error',
+                showClose: true,
+              })
+            }).catch(e =>{
+              message(e);
+            })
+          }).catch(() =>{})
+          break;
+        //关闭
+        case "close":
+          setTimeout(() => {
+            this.dialogInfo.visible = false;
+          }, 0);
+          break;
+        //保存表单
+        case "save":
+          const type = this.dialogInfo.type;
+          this.formInfo.ref.validate(valid => {
+            if (valid) {
+              this.btnLoading = true;
+              const params = {
+                data: this.formInfo.data
+              }
+              this.$http.post(this.nozzle.sysEquipAddUpdate, params).then(res => {
+                if (res.data.code === 1 || res.data.code === 200) {
+                  this.dialogInfo.visible = false;
+                  this.deviceTableInfo.refresh = Math.random();
+                }
+                this.$message({
+                  message: res.data.msg,
+                  type: res.data.code === 1 ? "success" : "error",
+                  showClose: true
+                });
+                this.btnLoading = false;
+              })
+              .catch(e => {
+                console.log(e);
+                this.btnLoading = false;
+              });
+            }
+          });
+          break;
+      }
+    },
+    //重置表单
+    resetForm() {
+      this.formInfo.data = {
+        id: undefined,
+        equipNo: "",
+        equipDesc: "",
+        equipFactory: "",
+        equipFactoryAbb: "",
+        contactName: "",
+        contactMobile: "",
+        siteCode: ""
+      }
+    },
+  }
+}
+</script>
\ No newline at end of file

diff --git a/src/App.vue b/src/App.vue
index c80ed45..cf24765 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -23,8 +23,4 @@
   color: #2c3e50;
   height: 100%;
 }
-
-.ss {
-  color: ;
-}
 </style>
diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index 53fadc2..7f0ac82 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -68,3 +68,41 @@
 .el-textarea .el-input__count {
   background: transparent;
 }
+/****页面通用样式****/
+.page-data {
+  display: flex;
+  flex-direction: column;
+}
+.page-data .page-filter {
+  text-align: left;
+}
+.page-data .page-content,
+.el-dialog__body .page-content {
+  flex: 1;
+  overflow: hidden;
+}
+.page-data .page-content .page-table {
+  height: 100%;
+}
+.page-data .page-content .page-table .red {
+  color: red;
+}
+.page-data-dialog .el-dialog {
+  display: flex;
+  flex-direction: column;
+  height: 60%;
+  max-height: 60%;
+  margin-top: 10vh !important;
+}
+.page-data-dialog .el-dialog__body {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  padding: 20px;
+  overflow-y: auto;
+}
+.page-data-dialog .el-pagination__sizes,
+.page-data-dialog .el-pagination__total,
+.page-data-dialog .el-pagination__jump {
+  display: none;
+}
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 9fe4611..5d045c0 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -1,15 +1,12 @@
 <template>
   <div id="pagetwo">
     <div class="form">
-      <span class="SelectTitle">站点编号/站点名:</span>
       <el-input
         v-model="searchStr"
         placeholder="请输入站点编号或站点名称"
         clearable
         @change="handleChangeSearch"
       ></el-input>
-      <span class="SelectTitle">时间选择:</span>
-
       <el-date-picker
         v-model="startDate"
         value-format="yyyy-MM-dd"
@@ -43,39 +40,20 @@
     </div>
 
     <el-table :data="listExtend" style="width: 100%; height: calc(100% - 82px)">
-      <el-table-column
-        type="index"
-        label="序号"
-        max-
-        width="70"
-      ></el-table-column>
+      <el-table-column type="index" label="序号" width="70"></el-table-column>
       <el-table-column
         prop="stCode"
         label="站点编号"
-        max-width="130"
+        max-width="120"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
         prop="stName"
         label="站点名称"
         show-overflow-tooltip
-        max-width="200"
-      ></el-table-column>
-      <el-table-column
-        prop="createTime"
-        label="站点安装时间"
-        max-width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="person"
-        label="安装人"
         max-width="150"
       ></el-table-column>
-      <el-table-column
-        prop="tt"
-        label="首次数据接入时间"
-        max-width="180"
-      ></el-table-column>
-      <el-table-column label="站点类型" max-width="150">
+      <el-table-column label="站点类型" width="120">
         <template slot-scope="scope">
           <div>
             <span v-if="scope.row.stationType == 0">水质站</span>
@@ -84,7 +62,36 @@
           </div>
         </template></el-table-column
       >
-      <el-table-column label="操作" max-width="150">
+      <el-table-column
+        prop="createTime"
+        label="站点安装时间"
+        max-width="180"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="person"
+        label="安装人"
+        width="120"
+      ></el-table-column>
+      <el-table-column label="关联设备" width="80">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            size="small"
+            v-if="scope.row.equips.length"
+            @click="handleClick('look', scope.row)"
+            >查看设备</el-button
+          >
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="tt"
+        label="首次数据接入时间"
+        max-width="180"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column label="操作" width="80">
         <template slot-scope="scope">
           <el-button
             type="text"
@@ -129,7 +136,7 @@
               class="selectInput"
               size="small"
               v-model="ruleForm.stationType"
-              placeholder="请选择"
+              placeholder="请选择站点类型"
             >
               <el-option
                 class="selectOption"
@@ -141,6 +148,23 @@
             </el-select>
             <span>按实际设备类型选择站点类型</span>
           </el-form-item>
+          <el-form-item label="所属项目" prop="platformCode">
+            <el-select
+              class="selectInput"
+              size="small"
+              filterable
+              v-model="ruleForm.platformCode"
+              placeholder="请选择所属项目"
+            >
+              <el-option
+                class="selectOption"
+                v-for="item in projectList"
+                :key="item.id"
+                :label="item.key"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="所属区域" prop="area">
             <el-cascader
               ref="cascader"
@@ -149,6 +173,7 @@
               v-model="ruleForm.area"
               :options="syscityList"
               filterable
+              placeholder="请选择所属区域"
               :props="syscityListProps"
               @change="handleChange"
               @visible-change="visiblechange"
@@ -238,7 +263,28 @@
         <el-button type="primary" @click="saveOru('ruleForm')">保存</el-button>
       </span>
     </el-dialog>
-
+    <!--关联设备弹窗-->
+    <page-dialog
+      class="page-data-dialog"
+      :title="dialogInfo.title[dialogInfo.type]"
+      :visible.sync="dialogInfo.visible"
+      :width="dialogInfo.width"
+      :bt-loading="dialogInfo.btLoading"
+      :bt-list="dialogInfo.btList"
+      @handleClick="handleClick"
+    >
+      <page-table
+        tabIndex
+        :api-url="deviceTableInfo.url"
+        :refresh="deviceTableInfo.refresh"
+        :data.sync="deviceTableInfo.data"
+        :query="deviceFilterInfo.query"
+        :init-curpage="deviceTableInfo.initCurpage"
+        :field-list="deviceTableInfo.fieldList"
+        :handle="deviceTableInfo.handle"
+        @handleClick="handleClick"
+      />
+    </page-dialog>
     <el-pagination
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
@@ -328,6 +374,13 @@
             trigger: "change"
           }
         ],
+        platformCode: [
+          {
+            required: true,
+            message: "请选择所属项目",
+            trigger: "change"
+          }
+        ],
         stName: [
           {
             required: true,
@@ -374,13 +427,119 @@
       value: [],
       // 站点管理/所属区域数组
       syscityList: [],
-      syscityListProps: { checkStrictly: true, value: "id", label: "name" }
+      syscityListProps: { checkStrictly: true, value: "id", label: "name" },
+      //当前用户权限内的项目数据
+      projectList: [],
+      //弹窗相关
+      dialogInfo: {
+        title: {
+          look: "关联设备列表"
+        },
+        width: "60%",
+        visible: false,
+        btLoading: false,
+        type: "",
+        btList: [
+          { label: "关闭", type: "", icon: "", event: "close", show: true }
+        ]
+      },
+      //设备搜索相关
+      deviceFilterInfo: {
+        query: {
+          searchStr: "",
+          startDate: "",
+          endDate: ""
+        },
+        list: [
+          {
+            type: "input",
+            label: "设备名称/编号",
+            value: "searchStr",
+            hideLabel: true
+          },
+          {
+            type: "date",
+            label: "开始时间",
+            value: "startDate",
+            dateType: "date",
+            datePickerOptions: "pickerOptionsStart",
+            hideLabel: true
+          },
+          {
+            type: "date",
+            label: "结束时间",
+            value: "endDate",
+            dateType: "date",
+            datePickerOptions: "pickerOptionsEnd",
+            hideLabel: true
+          },
+          {
+            type: "button",
+            label: "查询",
+            btType: "primary",
+            icon: "",
+            event: "search",
+            show: true
+          },
+          {
+            type: "button",
+            label: "添加设备",
+            btType: "primary",
+            icon: "",
+            event: "create",
+            show: true,
+            has: "m11-3-1"
+          }
+        ]
+      },
+      //设备表格相关
+      deviceTableInfo: {
+        url: "", //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [],
+        fieldList: [
+          { label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
+          {
+            label: "设备描述",
+            value: "equipDesc",
+            minWidth: 150,
+            tooltip: true
+          },
+          {
+            label: "设备厂家",
+            value: "equipFactory",
+            minWidth: 150,
+            tooltip: true
+          },
+          { label: "联系人", value: "contactName", width: 100 },
+          { label: "电话", value: "contactMobile", width: 120 }
+        ],
+        handle: {
+          fixed: "right",
+          label: "操作",
+          width: "80",
+          btList: [
+            {
+              label: "解绑",
+              size: "small",
+              type: "text",
+              event: "remove",
+              show: true,
+              has: "m11-3-3"
+            }
+          ]
+        }
+      },
+      //需要进行操作的站点Code
+      needHandleSiteCode: ""
     };
   },
   mounted() {
     this.getsyscityList();
     this.getlistExtend();
     this.getsityType();
+    this.getCurrentUserProject(); //获取当前用户所绑定的项目
   },
   watch: {
     "ruleForm.area": {
@@ -406,6 +565,12 @@
           this.dialogImageUrl = "";
         }
       }
+    },
+    "dialogInfo.visible"(val) {
+      if (!val) {
+        this.deviceTableInfo.data = [];
+        this.dialogInfo.btLoading = false;
+      }
     }
   },
   methods: {
@@ -523,7 +688,6 @@
     },
     // 获取站点列表
     async getlistExtend() {
-      // console.log(this.TimeValue);
       const { data } = await this.$http.post(this.nozzle.listExtend, {
         current: this.currentPage,
         data: {
@@ -554,7 +718,6 @@
             })
             .then(res => {
               this.yzaddflag = false;
-              this.getlistExtend();
             });
         }
       });
@@ -583,19 +746,18 @@
     // 添加站点
     addform(formName) {
       this.yzaddflag = true;
+      // 获取地区列表
       this.title = "新增站点";
     },
     // 操作里面的修改弹窗
     EditFZ(index, rows) {
       // 获取地区列表
-      // console.log(rows);
       for (let key in rows) {
         if (key === "stationType") {
           rows[key] = rows[key].toString();
         }
         this.ruleForm[key] = rows[key];
       }
-      // console.log(this.ruleForm);
       this.yzaddflag = true;
       this.title = "修改站点";
       this.FenZuflag2type = 2;
@@ -616,9 +778,79 @@
           siteType: "site_type"
         }
       });
-
       this.siteTypeList = data.data;
     },
+    //获取当前用户所绑定的项目
+    getCurrentUserProject() {
+      this.$http
+        .post(this.nozzle.sysPlatformList, {
+          current: 0,
+          size: 0,
+          data: { searchStr: "", startDate: "", endDate: "" }
+        })
+        .then(res => {
+          if (res.data.code === 1) {
+            this.projectList = res.data.data.list.map(item => {
+              return {
+                id: item.id,
+                key: item.name,
+                value: item.platformCode
+              };
+            });
+          }
+        });
+    },
+    //点击事件
+    handleClick(event, data, index) {
+      switch (event) {
+        //查看关联设备
+        case "look":
+          this.dialogInfo.visible = true;
+          this.dialogInfo.type = event;
+          this.deviceTableInfo.data = data.equips;
+          this.needHandleSiteCode = data.stCode;
+          break;
+        //解绑设备与站点
+        case "remove":
+          this.$confirm("此操作将解除设备和站点的绑定关系, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+            .then(res => {
+              const params = {
+                data: {
+                  siteCode: this.needHandleSiteCode,
+                  equipNos: [data.equipNo]
+                }
+              };
+              this.$http
+                .post(this.nozzle.sysEquipRemoveBatch, params)
+                .then(res => {
+                  if (res.data.code === 1 || res.data.code === 200) {
+                    this.deviceTableInfo.data.splice(index, 1);
+                    this.getlistExtend();
+                  }
+                  this.$message({
+                    message: res.data.msg,
+                    type: res.data.code === 1 ? "success" : "error",
+                    showClose: true
+                  });
+                })
+                .catch(e => {
+                  message(e);
+                });
+            })
+            .catch(() => {});
+          break;
+        //关闭
+        case "close":
+          setTimeout(() => {
+            this.dialogInfo.visible = false;
+          }, 0);
+          break;
+      }
+    },
     // 关闭弹框后做的操作
     closedialog(formName) {
       this.$refs["ruleForm"].resetFields();
@@ -648,7 +880,7 @@
       };
       this.$refs.cascader.$refs.panel.activePath = [];
       this.$refs.cascader.$refs.panel.clearCheckedNodes();
-      this.getlistExtend();
+      // this.getlistExtend();
     },
     handleChange(value) {
       // 取选中数组的最后一项的id
diff --git a/src/components/ConfigManager/device.vue b/src/components/ConfigManager/device.vue
new file mode 100644
index 0000000..f800811
--- /dev/null
+++ b/src/components/ConfigManager/device.vue
@@ -0,0 +1,297 @@
+<template>
+  <div class="page-data">
+    <!--搜素框-->
+    <div class="page-filter">
+      <page-filter
+        :query.sync="deviceFilterInfo.query"
+        :filter-list="deviceFilterInfo.list"
+        @handleClick="handleClick"
+      />
+    </div>
+    <div class="page-content">
+      <!--表格-->
+      <div class="h-100">
+        <page-table
+          tabIndex
+          pagination
+          :api-url="deviceTableInfo.url"
+          :refresh="deviceTableInfo.refresh"
+          :data.sync="deviceTableInfo.data"
+          :query="deviceFilterInfo.query"
+          :page-query="deviceTableInfo.pageQuery"
+          :list-type-info="listTypeInfo"
+          :init-curpage="deviceTableInfo.initCurpage"
+          :field-list="deviceTableInfo.fieldList"
+          :handle="deviceTableInfo.handle"
+          @handleClick="handleClick"
+        >
+          <template v-slot:col-status="scope">
+            <el-button type="text" size="small" :class="[scope.row.status === 1 ? '' : 'red']">
+              {{ scope.row.status === 1 ? "管理中" : "未管理" }}
+            </el-button>
+          </template>
+        </page-table>
+      </div>
+    </div>
+    <!--弹窗-->
+    <page-dialog
+      :title="dialogInfo.title[dialogInfo.type]"
+      :visible.sync="dialogInfo.visible"
+      :width="dialogInfo.width"
+      :bt-loading="dialogInfo.btLoading"
+      :bt-list="dialogInfo.btList"
+      @handleClick="handleClick"
+    >
+      <page-form
+        :ref-obj.sync="formInfo.ref"
+        :data="formInfo.data"
+        :field-list="formInfo.fieldList"
+        :rules="formInfo.rules"
+        :label-width="formInfo.labelWidth"
+        :list-type-info="listTypeInfo"
+        @handleClick="handleClick"
+      />
+    </page-dialog>
+  </div>
+</template>
+
+<script>
+import { message } from "./../../util/item";
+export default {
+  data() {
+    // 验证电话
+    let checkPhone = (rule, value, callback) => {
+      let check = this.$validate({ label: "电话", value, rules: ["phone"] });
+      if (!check.result) {
+        callback(new Error(check.message));
+      } else {
+        callback();
+      }
+    };
+    return {
+      //设备搜索相关
+      deviceFilterInfo: {
+        query: {
+          searchStr: "",
+          startDate: "",
+          endDate: ""
+        },
+        list: [
+          {type: "input", label: "设备名称/编号", value: "searchStr", hideLabel: true },
+          {type: "date", label: "开始时间", value: "startDate", dateType: "date", datePickerOptions: "pickerOptionsStart", hideLabel: true},
+          {type: "date", label: "结束时间", value: "endDate", dateType: "date", datePickerOptions: "pickerOptionsEnd", hideLabel: true},
+          {type: "button", label: "查询", btType: "primary", icon: "", event: "search", show: true},
+          {type: "button", label: "添加设备", btType: "primary", icon: "", event: "create", show: true, has: "m11-3-1"}
+        ]
+      },
+      //设备表格相关
+      deviceTableInfo: {
+        url: this.nozzle.sysEquipList, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [
+          {equipNo:1000,equipDesc:"3333",equipFactory:'4444'}
+        ],
+        fieldList: [
+          { label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
+          { label: "设备描述", value: "equipDesc", minWidth: 150, tooltip: true },
+          { label: "设备厂家", value: "equipFactory", minWidth: 150, tooltip: true },
+          { label: "厂家简称", value: "equipFactoryAbb", minWidth: 100, tooltip: true },
+          { label: "联系人", value: "contactName", width: 100 },
+          { label: "电话", value: "contactMobile", width: 120 },
+          { label: "站点编号", value: "siteCode", minWidth: 100, tooltip: true },
+          { label: "更新时间", value: "updateTime", minWidth: 150, tooltip: true }
+        ],
+        handle: {
+          fixed: "right",
+          label: "操作",
+          width: "120",
+          btList: [
+            { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-3-2' },
+            { label: "删除", size: "small", type: "text", event: "delete", show: true, has: 'm11-3-3' }
+          ]
+        }
+      },
+      //设备表单相关
+      formInfo: {
+        ref: null,
+        data: {
+          id: undefined,
+          equipNo: "",
+          equipDesc: "",
+          equipFactory: "",
+          equipFactoryAbb: "",
+          contactName: "",
+          contactMobile: "",
+          siteCode: ""
+        },
+        fieldList: [
+          { label: "设备编号", value: "equipNo", type: "input", required: true },
+          { label: "设备描述", value: "equipDesc", type: "input", required: true },
+          { label: "设备厂家", value: "equipFactory", type: "input", required: true },
+          { label: "厂家简称", value: "equipFactoryAbb", type: "input", required: true },
+          { label: "联系人", value: "contactName", type: "input", required: true },
+          { label: "电话", value: "contactMobile", type: "input", required: true, validator: checkPhone },
+          { label: "站点编号", value: "siteCode", type: "select", list: "siteList", filterable:true, required: true },
+        ],
+        rules: {},
+      },
+      //列表相关
+      listTypeInfo:{
+        siteList:[]
+      },
+      //弹窗相关
+      dialogInfo:{
+        title: {
+          update: '编辑设备',
+          create: '添加设备'
+        },
+        width: '500px',
+        visible: false,
+        btLoading: false,
+        type: '',
+        btList: [
+          {label:'关闭',type:'',icon:'',event:'close',show:true},
+          {label:'保存',type:'primary',icon:'',event:'save',show:true,loading:true}
+        ]
+      },
+    }
+  },
+  watch: {
+    "dialogInfo.visible"(val) {
+      if (!val) {
+        if (this.formInfo.ref) {
+          this.formInfo.ref.resetFields();
+        }
+        this.resetForm();
+        this.btnLoading = false;
+      }
+    },
+  },
+  created() {
+    this.initSiteData();
+  },
+  mounted() {
+    this.initRules();
+    this.deviceTableInfo.refresh = Math.random();
+  },
+  methods: {
+    //初始化验证
+    initRules() {
+      const formInfo = this.formInfo;
+      formInfo.rules = this.$initRules(formInfo.fieldList);
+    },
+    //初始化站点数据
+    initSiteData() {
+      this.$http.post(this.nozzle.listExtend, {
+        current: 0,
+        data: {searchStr: "",startDate: "",endDate: ""},
+        size: 0
+      }).then(res =>{
+        if(res.data.code === 1) {
+          this.listTypeInfo.siteList = res.data.data.list.map(item =>{
+            return {
+              key: item.stName,
+              value: item.stCode
+            }
+          })
+        }
+      })
+    },
+    //点击事件
+    handleClick(event, data) {
+      switch (event) {
+        //设备搜索
+        case "search":
+          this.deviceTableInfo.initCurpage = Math.random();
+          this.deviceTableInfo.refresh = Math.random();
+          break;
+        //设备添加按钮
+        case "create":
+          this.dialogInfo.type = event;
+          this.dialogInfo.visible = true;
+          break;
+        //编辑设备按钮
+        case "update":
+          this.dialogInfo.type = event;
+          this.dialogInfo.visible = true;
+          for (let key in data) {
+            if (key in this.formInfo.data) {
+              this.formInfo.data[key] = data[key];
+            }
+          }
+          break;
+        //删除设备按钮
+        case "delete":
+          this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(res =>{
+            this.$http.post(this.nozzle.sysEquipDelete,{data:{equipNo:data.equipNo}}).then(res =>{
+              if(res.data.code === 1 || res.data.code === 200) {
+                this.deviceTableInfo.refresh = Math.random();
+                this.deviceTableInfo.initCurpage = Math.random();
+              }
+              this.$message({
+                message: res.data.msg,
+                type: res.data.code === 1 ? 'success' : 'error',
+                showClose: true,
+              })
+            }).catch(e =>{
+              message(e);
+            })
+          }).catch(() =>{})
+          break;
+        //关闭
+        case "close":
+          setTimeout(() => {
+            this.dialogInfo.visible = false;
+          }, 0);
+          break;
+        //保存表单
+        case "save":
+          const type = this.dialogInfo.type;
+          this.formInfo.ref.validate(valid => {
+            if (valid) {
+              this.btnLoading = true;
+              const params = {
+                data: this.formInfo.data
+              }
+              this.$http.post(this.nozzle.sysEquipAddUpdate, params).then(res => {
+                if (res.data.code === 1 || res.data.code === 200) {
+                  this.dialogInfo.visible = false;
+                  this.deviceTableInfo.refresh = Math.random();
+                }
+                this.$message({
+                  message: res.data.msg,
+                  type: res.data.code === 1 ? "success" : "error",
+                  showClose: true
+                });
+                this.btnLoading = false;
+              })
+              .catch(e => {
+                console.log(e);
+                this.btnLoading = false;
+              });
+            }
+          });
+          break;
+      }
+    },
+    //重置表单
+    resetForm() {
+      this.formInfo.data = {
+        id: undefined,
+        equipNo: "",
+        equipDesc: "",
+        equipFactory: "",
+        equipFactoryAbb: "",
+        contactName: "",
+        contactMobile: "",
+        siteCode: ""
+      }
+    },
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index da934e0..065f3da 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -989,22 +989,6 @@
 </script>
 
 <style lang="scss" scoped>
-.page-data {
-  @include fd();
-}
-.page-filter {
-  text-align: left;
-}
-.page-content {
-  flex: 1;
-  overflow: hidden;
-  .page-table {
-    height: 100%;
-  }
-  .red {
-    color: red;
-  }
-}
 .btn-group {
   height: 100%;
   @include fdaj(center, center);

diff --git a/src/App.vue b/src/App.vue
index c80ed45..cf24765 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -23,8 +23,4 @@
   color: #2c3e50;
   height: 100%;
 }
-
-.ss {
-  color: ;
-}
 </style>
diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index 53fadc2..7f0ac82 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -68,3 +68,41 @@
 .el-textarea .el-input__count {
   background: transparent;
 }
+/****页面通用样式****/
+.page-data {
+  display: flex;
+  flex-direction: column;
+}
+.page-data .page-filter {
+  text-align: left;
+}
+.page-data .page-content,
+.el-dialog__body .page-content {
+  flex: 1;
+  overflow: hidden;
+}
+.page-data .page-content .page-table {
+  height: 100%;
+}
+.page-data .page-content .page-table .red {
+  color: red;
+}
+.page-data-dialog .el-dialog {
+  display: flex;
+  flex-direction: column;
+  height: 60%;
+  max-height: 60%;
+  margin-top: 10vh !important;
+}
+.page-data-dialog .el-dialog__body {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  padding: 20px;
+  overflow-y: auto;
+}
+.page-data-dialog .el-pagination__sizes,
+.page-data-dialog .el-pagination__total,
+.page-data-dialog .el-pagination__jump {
+  display: none;
+}
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 9fe4611..5d045c0 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -1,15 +1,12 @@
 <template>
   <div id="pagetwo">
     <div class="form">
-      <span class="SelectTitle">站点编号/站点名:</span>
       <el-input
         v-model="searchStr"
         placeholder="请输入站点编号或站点名称"
         clearable
         @change="handleChangeSearch"
       ></el-input>
-      <span class="SelectTitle">时间选择:</span>
-
       <el-date-picker
         v-model="startDate"
         value-format="yyyy-MM-dd"
@@ -43,39 +40,20 @@
     </div>
 
     <el-table :data="listExtend" style="width: 100%; height: calc(100% - 82px)">
-      <el-table-column
-        type="index"
-        label="序号"
-        max-
-        width="70"
-      ></el-table-column>
+      <el-table-column type="index" label="序号" width="70"></el-table-column>
       <el-table-column
         prop="stCode"
         label="站点编号"
-        max-width="130"
+        max-width="120"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
         prop="stName"
         label="站点名称"
         show-overflow-tooltip
-        max-width="200"
-      ></el-table-column>
-      <el-table-column
-        prop="createTime"
-        label="站点安装时间"
-        max-width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="person"
-        label="安装人"
         max-width="150"
       ></el-table-column>
-      <el-table-column
-        prop="tt"
-        label="首次数据接入时间"
-        max-width="180"
-      ></el-table-column>
-      <el-table-column label="站点类型" max-width="150">
+      <el-table-column label="站点类型" width="120">
         <template slot-scope="scope">
           <div>
             <span v-if="scope.row.stationType == 0">水质站</span>
@@ -84,7 +62,36 @@
           </div>
         </template></el-table-column
       >
-      <el-table-column label="操作" max-width="150">
+      <el-table-column
+        prop="createTime"
+        label="站点安装时间"
+        max-width="180"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="person"
+        label="安装人"
+        width="120"
+      ></el-table-column>
+      <el-table-column label="关联设备" width="80">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            size="small"
+            v-if="scope.row.equips.length"
+            @click="handleClick('look', scope.row)"
+            >查看设备</el-button
+          >
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="tt"
+        label="首次数据接入时间"
+        max-width="180"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column label="操作" width="80">
         <template slot-scope="scope">
           <el-button
             type="text"
@@ -129,7 +136,7 @@
               class="selectInput"
               size="small"
               v-model="ruleForm.stationType"
-              placeholder="请选择"
+              placeholder="请选择站点类型"
             >
               <el-option
                 class="selectOption"
@@ -141,6 +148,23 @@
             </el-select>
             <span>按实际设备类型选择站点类型</span>
           </el-form-item>
+          <el-form-item label="所属项目" prop="platformCode">
+            <el-select
+              class="selectInput"
+              size="small"
+              filterable
+              v-model="ruleForm.platformCode"
+              placeholder="请选择所属项目"
+            >
+              <el-option
+                class="selectOption"
+                v-for="item in projectList"
+                :key="item.id"
+                :label="item.key"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="所属区域" prop="area">
             <el-cascader
               ref="cascader"
@@ -149,6 +173,7 @@
               v-model="ruleForm.area"
               :options="syscityList"
               filterable
+              placeholder="请选择所属区域"
               :props="syscityListProps"
               @change="handleChange"
               @visible-change="visiblechange"
@@ -238,7 +263,28 @@
         <el-button type="primary" @click="saveOru('ruleForm')">保存</el-button>
       </span>
     </el-dialog>
-
+    <!--关联设备弹窗-->
+    <page-dialog
+      class="page-data-dialog"
+      :title="dialogInfo.title[dialogInfo.type]"
+      :visible.sync="dialogInfo.visible"
+      :width="dialogInfo.width"
+      :bt-loading="dialogInfo.btLoading"
+      :bt-list="dialogInfo.btList"
+      @handleClick="handleClick"
+    >
+      <page-table
+        tabIndex
+        :api-url="deviceTableInfo.url"
+        :refresh="deviceTableInfo.refresh"
+        :data.sync="deviceTableInfo.data"
+        :query="deviceFilterInfo.query"
+        :init-curpage="deviceTableInfo.initCurpage"
+        :field-list="deviceTableInfo.fieldList"
+        :handle="deviceTableInfo.handle"
+        @handleClick="handleClick"
+      />
+    </page-dialog>
     <el-pagination
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
@@ -328,6 +374,13 @@
             trigger: "change"
           }
         ],
+        platformCode: [
+          {
+            required: true,
+            message: "请选择所属项目",
+            trigger: "change"
+          }
+        ],
         stName: [
           {
             required: true,
@@ -374,13 +427,119 @@
       value: [],
       // 站点管理/所属区域数组
       syscityList: [],
-      syscityListProps: { checkStrictly: true, value: "id", label: "name" }
+      syscityListProps: { checkStrictly: true, value: "id", label: "name" },
+      //当前用户权限内的项目数据
+      projectList: [],
+      //弹窗相关
+      dialogInfo: {
+        title: {
+          look: "关联设备列表"
+        },
+        width: "60%",
+        visible: false,
+        btLoading: false,
+        type: "",
+        btList: [
+          { label: "关闭", type: "", icon: "", event: "close", show: true }
+        ]
+      },
+      //设备搜索相关
+      deviceFilterInfo: {
+        query: {
+          searchStr: "",
+          startDate: "",
+          endDate: ""
+        },
+        list: [
+          {
+            type: "input",
+            label: "设备名称/编号",
+            value: "searchStr",
+            hideLabel: true
+          },
+          {
+            type: "date",
+            label: "开始时间",
+            value: "startDate",
+            dateType: "date",
+            datePickerOptions: "pickerOptionsStart",
+            hideLabel: true
+          },
+          {
+            type: "date",
+            label: "结束时间",
+            value: "endDate",
+            dateType: "date",
+            datePickerOptions: "pickerOptionsEnd",
+            hideLabel: true
+          },
+          {
+            type: "button",
+            label: "查询",
+            btType: "primary",
+            icon: "",
+            event: "search",
+            show: true
+          },
+          {
+            type: "button",
+            label: "添加设备",
+            btType: "primary",
+            icon: "",
+            event: "create",
+            show: true,
+            has: "m11-3-1"
+          }
+        ]
+      },
+      //设备表格相关
+      deviceTableInfo: {
+        url: "", //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [],
+        fieldList: [
+          { label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
+          {
+            label: "设备描述",
+            value: "equipDesc",
+            minWidth: 150,
+            tooltip: true
+          },
+          {
+            label: "设备厂家",
+            value: "equipFactory",
+            minWidth: 150,
+            tooltip: true
+          },
+          { label: "联系人", value: "contactName", width: 100 },
+          { label: "电话", value: "contactMobile", width: 120 }
+        ],
+        handle: {
+          fixed: "right",
+          label: "操作",
+          width: "80",
+          btList: [
+            {
+              label: "解绑",
+              size: "small",
+              type: "text",
+              event: "remove",
+              show: true,
+              has: "m11-3-3"
+            }
+          ]
+        }
+      },
+      //需要进行操作的站点Code
+      needHandleSiteCode: ""
     };
   },
   mounted() {
     this.getsyscityList();
     this.getlistExtend();
     this.getsityType();
+    this.getCurrentUserProject(); //获取当前用户所绑定的项目
   },
   watch: {
     "ruleForm.area": {
@@ -406,6 +565,12 @@
           this.dialogImageUrl = "";
         }
       }
+    },
+    "dialogInfo.visible"(val) {
+      if (!val) {
+        this.deviceTableInfo.data = [];
+        this.dialogInfo.btLoading = false;
+      }
     }
   },
   methods: {
@@ -523,7 +688,6 @@
     },
     // 获取站点列表
     async getlistExtend() {
-      // console.log(this.TimeValue);
       const { data } = await this.$http.post(this.nozzle.listExtend, {
         current: this.currentPage,
         data: {
@@ -554,7 +718,6 @@
             })
             .then(res => {
               this.yzaddflag = false;
-              this.getlistExtend();
             });
         }
       });
@@ -583,19 +746,18 @@
     // 添加站点
     addform(formName) {
       this.yzaddflag = true;
+      // 获取地区列表
       this.title = "新增站点";
     },
     // 操作里面的修改弹窗
     EditFZ(index, rows) {
       // 获取地区列表
-      // console.log(rows);
       for (let key in rows) {
         if (key === "stationType") {
           rows[key] = rows[key].toString();
         }
         this.ruleForm[key] = rows[key];
       }
-      // console.log(this.ruleForm);
       this.yzaddflag = true;
       this.title = "修改站点";
       this.FenZuflag2type = 2;
@@ -616,9 +778,79 @@
           siteType: "site_type"
         }
       });
-
       this.siteTypeList = data.data;
     },
+    //获取当前用户所绑定的项目
+    getCurrentUserProject() {
+      this.$http
+        .post(this.nozzle.sysPlatformList, {
+          current: 0,
+          size: 0,
+          data: { searchStr: "", startDate: "", endDate: "" }
+        })
+        .then(res => {
+          if (res.data.code === 1) {
+            this.projectList = res.data.data.list.map(item => {
+              return {
+                id: item.id,
+                key: item.name,
+                value: item.platformCode
+              };
+            });
+          }
+        });
+    },
+    //点击事件
+    handleClick(event, data, index) {
+      switch (event) {
+        //查看关联设备
+        case "look":
+          this.dialogInfo.visible = true;
+          this.dialogInfo.type = event;
+          this.deviceTableInfo.data = data.equips;
+          this.needHandleSiteCode = data.stCode;
+          break;
+        //解绑设备与站点
+        case "remove":
+          this.$confirm("此操作将解除设备和站点的绑定关系, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+            .then(res => {
+              const params = {
+                data: {
+                  siteCode: this.needHandleSiteCode,
+                  equipNos: [data.equipNo]
+                }
+              };
+              this.$http
+                .post(this.nozzle.sysEquipRemoveBatch, params)
+                .then(res => {
+                  if (res.data.code === 1 || res.data.code === 200) {
+                    this.deviceTableInfo.data.splice(index, 1);
+                    this.getlistExtend();
+                  }
+                  this.$message({
+                    message: res.data.msg,
+                    type: res.data.code === 1 ? "success" : "error",
+                    showClose: true
+                  });
+                })
+                .catch(e => {
+                  message(e);
+                });
+            })
+            .catch(() => {});
+          break;
+        //关闭
+        case "close":
+          setTimeout(() => {
+            this.dialogInfo.visible = false;
+          }, 0);
+          break;
+      }
+    },
     // 关闭弹框后做的操作
     closedialog(formName) {
       this.$refs["ruleForm"].resetFields();
@@ -648,7 +880,7 @@
       };
       this.$refs.cascader.$refs.panel.activePath = [];
       this.$refs.cascader.$refs.panel.clearCheckedNodes();
-      this.getlistExtend();
+      // this.getlistExtend();
     },
     handleChange(value) {
       // 取选中数组的最后一项的id
diff --git a/src/components/ConfigManager/device.vue b/src/components/ConfigManager/device.vue
new file mode 100644
index 0000000..f800811
--- /dev/null
+++ b/src/components/ConfigManager/device.vue
@@ -0,0 +1,297 @@
+<template>
+  <div class="page-data">
+    <!--搜素框-->
+    <div class="page-filter">
+      <page-filter
+        :query.sync="deviceFilterInfo.query"
+        :filter-list="deviceFilterInfo.list"
+        @handleClick="handleClick"
+      />
+    </div>
+    <div class="page-content">
+      <!--表格-->
+      <div class="h-100">
+        <page-table
+          tabIndex
+          pagination
+          :api-url="deviceTableInfo.url"
+          :refresh="deviceTableInfo.refresh"
+          :data.sync="deviceTableInfo.data"
+          :query="deviceFilterInfo.query"
+          :page-query="deviceTableInfo.pageQuery"
+          :list-type-info="listTypeInfo"
+          :init-curpage="deviceTableInfo.initCurpage"
+          :field-list="deviceTableInfo.fieldList"
+          :handle="deviceTableInfo.handle"
+          @handleClick="handleClick"
+        >
+          <template v-slot:col-status="scope">
+            <el-button type="text" size="small" :class="[scope.row.status === 1 ? '' : 'red']">
+              {{ scope.row.status === 1 ? "管理中" : "未管理" }}
+            </el-button>
+          </template>
+        </page-table>
+      </div>
+    </div>
+    <!--弹窗-->
+    <page-dialog
+      :title="dialogInfo.title[dialogInfo.type]"
+      :visible.sync="dialogInfo.visible"
+      :width="dialogInfo.width"
+      :bt-loading="dialogInfo.btLoading"
+      :bt-list="dialogInfo.btList"
+      @handleClick="handleClick"
+    >
+      <page-form
+        :ref-obj.sync="formInfo.ref"
+        :data="formInfo.data"
+        :field-list="formInfo.fieldList"
+        :rules="formInfo.rules"
+        :label-width="formInfo.labelWidth"
+        :list-type-info="listTypeInfo"
+        @handleClick="handleClick"
+      />
+    </page-dialog>
+  </div>
+</template>
+
+<script>
+import { message } from "./../../util/item";
+export default {
+  data() {
+    // 验证电话
+    let checkPhone = (rule, value, callback) => {
+      let check = this.$validate({ label: "电话", value, rules: ["phone"] });
+      if (!check.result) {
+        callback(new Error(check.message));
+      } else {
+        callback();
+      }
+    };
+    return {
+      //设备搜索相关
+      deviceFilterInfo: {
+        query: {
+          searchStr: "",
+          startDate: "",
+          endDate: ""
+        },
+        list: [
+          {type: "input", label: "设备名称/编号", value: "searchStr", hideLabel: true },
+          {type: "date", label: "开始时间", value: "startDate", dateType: "date", datePickerOptions: "pickerOptionsStart", hideLabel: true},
+          {type: "date", label: "结束时间", value: "endDate", dateType: "date", datePickerOptions: "pickerOptionsEnd", hideLabel: true},
+          {type: "button", label: "查询", btType: "primary", icon: "", event: "search", show: true},
+          {type: "button", label: "添加设备", btType: "primary", icon: "", event: "create", show: true, has: "m11-3-1"}
+        ]
+      },
+      //设备表格相关
+      deviceTableInfo: {
+        url: this.nozzle.sysEquipList, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [
+          {equipNo:1000,equipDesc:"3333",equipFactory:'4444'}
+        ],
+        fieldList: [
+          { label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
+          { label: "设备描述", value: "equipDesc", minWidth: 150, tooltip: true },
+          { label: "设备厂家", value: "equipFactory", minWidth: 150, tooltip: true },
+          { label: "厂家简称", value: "equipFactoryAbb", minWidth: 100, tooltip: true },
+          { label: "联系人", value: "contactName", width: 100 },
+          { label: "电话", value: "contactMobile", width: 120 },
+          { label: "站点编号", value: "siteCode", minWidth: 100, tooltip: true },
+          { label: "更新时间", value: "updateTime", minWidth: 150, tooltip: true }
+        ],
+        handle: {
+          fixed: "right",
+          label: "操作",
+          width: "120",
+          btList: [
+            { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-3-2' },
+            { label: "删除", size: "small", type: "text", event: "delete", show: true, has: 'm11-3-3' }
+          ]
+        }
+      },
+      //设备表单相关
+      formInfo: {
+        ref: null,
+        data: {
+          id: undefined,
+          equipNo: "",
+          equipDesc: "",
+          equipFactory: "",
+          equipFactoryAbb: "",
+          contactName: "",
+          contactMobile: "",
+          siteCode: ""
+        },
+        fieldList: [
+          { label: "设备编号", value: "equipNo", type: "input", required: true },
+          { label: "设备描述", value: "equipDesc", type: "input", required: true },
+          { label: "设备厂家", value: "equipFactory", type: "input", required: true },
+          { label: "厂家简称", value: "equipFactoryAbb", type: "input", required: true },
+          { label: "联系人", value: "contactName", type: "input", required: true },
+          { label: "电话", value: "contactMobile", type: "input", required: true, validator: checkPhone },
+          { label: "站点编号", value: "siteCode", type: "select", list: "siteList", filterable:true, required: true },
+        ],
+        rules: {},
+      },
+      //列表相关
+      listTypeInfo:{
+        siteList:[]
+      },
+      //弹窗相关
+      dialogInfo:{
+        title: {
+          update: '编辑设备',
+          create: '添加设备'
+        },
+        width: '500px',
+        visible: false,
+        btLoading: false,
+        type: '',
+        btList: [
+          {label:'关闭',type:'',icon:'',event:'close',show:true},
+          {label:'保存',type:'primary',icon:'',event:'save',show:true,loading:true}
+        ]
+      },
+    }
+  },
+  watch: {
+    "dialogInfo.visible"(val) {
+      if (!val) {
+        if (this.formInfo.ref) {
+          this.formInfo.ref.resetFields();
+        }
+        this.resetForm();
+        this.btnLoading = false;
+      }
+    },
+  },
+  created() {
+    this.initSiteData();
+  },
+  mounted() {
+    this.initRules();
+    this.deviceTableInfo.refresh = Math.random();
+  },
+  methods: {
+    //初始化验证
+    initRules() {
+      const formInfo = this.formInfo;
+      formInfo.rules = this.$initRules(formInfo.fieldList);
+    },
+    //初始化站点数据
+    initSiteData() {
+      this.$http.post(this.nozzle.listExtend, {
+        current: 0,
+        data: {searchStr: "",startDate: "",endDate: ""},
+        size: 0
+      }).then(res =>{
+        if(res.data.code === 1) {
+          this.listTypeInfo.siteList = res.data.data.list.map(item =>{
+            return {
+              key: item.stName,
+              value: item.stCode
+            }
+          })
+        }
+      })
+    },
+    //点击事件
+    handleClick(event, data) {
+      switch (event) {
+        //设备搜索
+        case "search":
+          this.deviceTableInfo.initCurpage = Math.random();
+          this.deviceTableInfo.refresh = Math.random();
+          break;
+        //设备添加按钮
+        case "create":
+          this.dialogInfo.type = event;
+          this.dialogInfo.visible = true;
+          break;
+        //编辑设备按钮
+        case "update":
+          this.dialogInfo.type = event;
+          this.dialogInfo.visible = true;
+          for (let key in data) {
+            if (key in this.formInfo.data) {
+              this.formInfo.data[key] = data[key];
+            }
+          }
+          break;
+        //删除设备按钮
+        case "delete":
+          this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(res =>{
+            this.$http.post(this.nozzle.sysEquipDelete,{data:{equipNo:data.equipNo}}).then(res =>{
+              if(res.data.code === 1 || res.data.code === 200) {
+                this.deviceTableInfo.refresh = Math.random();
+                this.deviceTableInfo.initCurpage = Math.random();
+              }
+              this.$message({
+                message: res.data.msg,
+                type: res.data.code === 1 ? 'success' : 'error',
+                showClose: true,
+              })
+            }).catch(e =>{
+              message(e);
+            })
+          }).catch(() =>{})
+          break;
+        //关闭
+        case "close":
+          setTimeout(() => {
+            this.dialogInfo.visible = false;
+          }, 0);
+          break;
+        //保存表单
+        case "save":
+          const type = this.dialogInfo.type;
+          this.formInfo.ref.validate(valid => {
+            if (valid) {
+              this.btnLoading = true;
+              const params = {
+                data: this.formInfo.data
+              }
+              this.$http.post(this.nozzle.sysEquipAddUpdate, params).then(res => {
+                if (res.data.code === 1 || res.data.code === 200) {
+                  this.dialogInfo.visible = false;
+                  this.deviceTableInfo.refresh = Math.random();
+                }
+                this.$message({
+                  message: res.data.msg,
+                  type: res.data.code === 1 ? "success" : "error",
+                  showClose: true
+                });
+                this.btnLoading = false;
+              })
+              .catch(e => {
+                console.log(e);
+                this.btnLoading = false;
+              });
+            }
+          });
+          break;
+      }
+    },
+    //重置表单
+    resetForm() {
+      this.formInfo.data = {
+        id: undefined,
+        equipNo: "",
+        equipDesc: "",
+        equipFactory: "",
+        equipFactoryAbb: "",
+        contactName: "",
+        contactMobile: "",
+        siteCode: ""
+      }
+    },
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index da934e0..065f3da 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -989,22 +989,6 @@
 </script>
 
 <style lang="scss" scoped>
-.page-data {
-  @include fd();
-}
-.page-filter {
-  text-align: left;
-}
-.page-content {
-  flex: 1;
-  overflow: hidden;
-  .page-table {
-    height: 100%;
-  }
-  .red {
-    color: red;
-  }
-}
 .btn-group {
   height: 100%;
   @include fdaj(center, center);
diff --git a/src/components/common/PageTable/index.vue b/src/components/common/PageTable/index.vue
index aade3fc..0536b03 100644
--- a/src/components/common/PageTable/index.vue
+++ b/src/components/common/PageTable/index.vue
@@ -87,7 +87,7 @@
               v-has="item.has ? item.has : ''"
               :disabled="item.disabled"
               :loading="scope.row[item.loading]"
-              @click="handleClick(item.event, scope.row)"
+              @click="handleClick(item.event, scope.row, scope.$index)"
             >
               {{ item.label }}
             </el-button>
@@ -102,7 +102,7 @@
         layout="total, sizes, prev, pager, next, jumper"
         :total="listInfo.total"
         :pager-count="5"
-        :page-sizes="[20, 50, 100, 500, 1000]"
+        :page-sizes="[10, 50, 100, 500, 1000]"
         :page-size="listInfo.query.size"
         :current-page.sync="listInfo.query.current"
         @current-change="handleCurrentChange"
@@ -207,7 +207,7 @@
         loading:false,  //加载动画
         query:{ //查询条件
           current:1,  //当前页
-          size:20,  //每页条数
+          size:10,  //每页条数
         }
       },
     }
@@ -250,8 +250,8 @@
       this.$emit('handleEvent', this.type, rows);
     },
     //派发按钮点击事件
-    handleClick(event, data){
-      this.$emit('handleClick', event, data);
+    handleClick(event, data, index){
+      this.$emit('handleClick', event, data, index);
     },
     /**
       * 通过key找到在列表中对应的显示

diff --git a/src/App.vue b/src/App.vue
index c80ed45..cf24765 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -23,8 +23,4 @@
   color: #2c3e50;
   height: 100%;
 }
-
-.ss {
-  color: ;
-}
 </style>
diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index 53fadc2..7f0ac82 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -68,3 +68,41 @@
 .el-textarea .el-input__count {
   background: transparent;
 }
+/****页面通用样式****/
+.page-data {
+  display: flex;
+  flex-direction: column;
+}
+.page-data .page-filter {
+  text-align: left;
+}
+.page-data .page-content,
+.el-dialog__body .page-content {
+  flex: 1;
+  overflow: hidden;
+}
+.page-data .page-content .page-table {
+  height: 100%;
+}
+.page-data .page-content .page-table .red {
+  color: red;
+}
+.page-data-dialog .el-dialog {
+  display: flex;
+  flex-direction: column;
+  height: 60%;
+  max-height: 60%;
+  margin-top: 10vh !important;
+}
+.page-data-dialog .el-dialog__body {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  padding: 20px;
+  overflow-y: auto;
+}
+.page-data-dialog .el-pagination__sizes,
+.page-data-dialog .el-pagination__total,
+.page-data-dialog .el-pagination__jump {
+  display: none;
+}
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 9fe4611..5d045c0 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -1,15 +1,12 @@
 <template>
   <div id="pagetwo">
     <div class="form">
-      <span class="SelectTitle">站点编号/站点名:</span>
       <el-input
         v-model="searchStr"
         placeholder="请输入站点编号或站点名称"
         clearable
         @change="handleChangeSearch"
       ></el-input>
-      <span class="SelectTitle">时间选择:</span>
-
       <el-date-picker
         v-model="startDate"
         value-format="yyyy-MM-dd"
@@ -43,39 +40,20 @@
     </div>
 
     <el-table :data="listExtend" style="width: 100%; height: calc(100% - 82px)">
-      <el-table-column
-        type="index"
-        label="序号"
-        max-
-        width="70"
-      ></el-table-column>
+      <el-table-column type="index" label="序号" width="70"></el-table-column>
       <el-table-column
         prop="stCode"
         label="站点编号"
-        max-width="130"
+        max-width="120"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
         prop="stName"
         label="站点名称"
         show-overflow-tooltip
-        max-width="200"
-      ></el-table-column>
-      <el-table-column
-        prop="createTime"
-        label="站点安装时间"
-        max-width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="person"
-        label="安装人"
         max-width="150"
       ></el-table-column>
-      <el-table-column
-        prop="tt"
-        label="首次数据接入时间"
-        max-width="180"
-      ></el-table-column>
-      <el-table-column label="站点类型" max-width="150">
+      <el-table-column label="站点类型" width="120">
         <template slot-scope="scope">
           <div>
             <span v-if="scope.row.stationType == 0">水质站</span>
@@ -84,7 +62,36 @@
           </div>
         </template></el-table-column
       >
-      <el-table-column label="操作" max-width="150">
+      <el-table-column
+        prop="createTime"
+        label="站点安装时间"
+        max-width="180"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="person"
+        label="安装人"
+        width="120"
+      ></el-table-column>
+      <el-table-column label="关联设备" width="80">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            size="small"
+            v-if="scope.row.equips.length"
+            @click="handleClick('look', scope.row)"
+            >查看设备</el-button
+          >
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="tt"
+        label="首次数据接入时间"
+        max-width="180"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column label="操作" width="80">
         <template slot-scope="scope">
           <el-button
             type="text"
@@ -129,7 +136,7 @@
               class="selectInput"
               size="small"
               v-model="ruleForm.stationType"
-              placeholder="请选择"
+              placeholder="请选择站点类型"
             >
               <el-option
                 class="selectOption"
@@ -141,6 +148,23 @@
             </el-select>
             <span>按实际设备类型选择站点类型</span>
           </el-form-item>
+          <el-form-item label="所属项目" prop="platformCode">
+            <el-select
+              class="selectInput"
+              size="small"
+              filterable
+              v-model="ruleForm.platformCode"
+              placeholder="请选择所属项目"
+            >
+              <el-option
+                class="selectOption"
+                v-for="item in projectList"
+                :key="item.id"
+                :label="item.key"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="所属区域" prop="area">
             <el-cascader
               ref="cascader"
@@ -149,6 +173,7 @@
               v-model="ruleForm.area"
               :options="syscityList"
               filterable
+              placeholder="请选择所属区域"
               :props="syscityListProps"
               @change="handleChange"
               @visible-change="visiblechange"
@@ -238,7 +263,28 @@
         <el-button type="primary" @click="saveOru('ruleForm')">保存</el-button>
       </span>
     </el-dialog>
-
+    <!--关联设备弹窗-->
+    <page-dialog
+      class="page-data-dialog"
+      :title="dialogInfo.title[dialogInfo.type]"
+      :visible.sync="dialogInfo.visible"
+      :width="dialogInfo.width"
+      :bt-loading="dialogInfo.btLoading"
+      :bt-list="dialogInfo.btList"
+      @handleClick="handleClick"
+    >
+      <page-table
+        tabIndex
+        :api-url="deviceTableInfo.url"
+        :refresh="deviceTableInfo.refresh"
+        :data.sync="deviceTableInfo.data"
+        :query="deviceFilterInfo.query"
+        :init-curpage="deviceTableInfo.initCurpage"
+        :field-list="deviceTableInfo.fieldList"
+        :handle="deviceTableInfo.handle"
+        @handleClick="handleClick"
+      />
+    </page-dialog>
     <el-pagination
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
@@ -328,6 +374,13 @@
             trigger: "change"
           }
         ],
+        platformCode: [
+          {
+            required: true,
+            message: "请选择所属项目",
+            trigger: "change"
+          }
+        ],
         stName: [
           {
             required: true,
@@ -374,13 +427,119 @@
       value: [],
       // 站点管理/所属区域数组
       syscityList: [],
-      syscityListProps: { checkStrictly: true, value: "id", label: "name" }
+      syscityListProps: { checkStrictly: true, value: "id", label: "name" },
+      //当前用户权限内的项目数据
+      projectList: [],
+      //弹窗相关
+      dialogInfo: {
+        title: {
+          look: "关联设备列表"
+        },
+        width: "60%",
+        visible: false,
+        btLoading: false,
+        type: "",
+        btList: [
+          { label: "关闭", type: "", icon: "", event: "close", show: true }
+        ]
+      },
+      //设备搜索相关
+      deviceFilterInfo: {
+        query: {
+          searchStr: "",
+          startDate: "",
+          endDate: ""
+        },
+        list: [
+          {
+            type: "input",
+            label: "设备名称/编号",
+            value: "searchStr",
+            hideLabel: true
+          },
+          {
+            type: "date",
+            label: "开始时间",
+            value: "startDate",
+            dateType: "date",
+            datePickerOptions: "pickerOptionsStart",
+            hideLabel: true
+          },
+          {
+            type: "date",
+            label: "结束时间",
+            value: "endDate",
+            dateType: "date",
+            datePickerOptions: "pickerOptionsEnd",
+            hideLabel: true
+          },
+          {
+            type: "button",
+            label: "查询",
+            btType: "primary",
+            icon: "",
+            event: "search",
+            show: true
+          },
+          {
+            type: "button",
+            label: "添加设备",
+            btType: "primary",
+            icon: "",
+            event: "create",
+            show: true,
+            has: "m11-3-1"
+          }
+        ]
+      },
+      //设备表格相关
+      deviceTableInfo: {
+        url: "", //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [],
+        fieldList: [
+          { label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
+          {
+            label: "设备描述",
+            value: "equipDesc",
+            minWidth: 150,
+            tooltip: true
+          },
+          {
+            label: "设备厂家",
+            value: "equipFactory",
+            minWidth: 150,
+            tooltip: true
+          },
+          { label: "联系人", value: "contactName", width: 100 },
+          { label: "电话", value: "contactMobile", width: 120 }
+        ],
+        handle: {
+          fixed: "right",
+          label: "操作",
+          width: "80",
+          btList: [
+            {
+              label: "解绑",
+              size: "small",
+              type: "text",
+              event: "remove",
+              show: true,
+              has: "m11-3-3"
+            }
+          ]
+        }
+      },
+      //需要进行操作的站点Code
+      needHandleSiteCode: ""
     };
   },
   mounted() {
     this.getsyscityList();
     this.getlistExtend();
     this.getsityType();
+    this.getCurrentUserProject(); //获取当前用户所绑定的项目
   },
   watch: {
     "ruleForm.area": {
@@ -406,6 +565,12 @@
           this.dialogImageUrl = "";
         }
       }
+    },
+    "dialogInfo.visible"(val) {
+      if (!val) {
+        this.deviceTableInfo.data = [];
+        this.dialogInfo.btLoading = false;
+      }
     }
   },
   methods: {
@@ -523,7 +688,6 @@
     },
     // 获取站点列表
     async getlistExtend() {
-      // console.log(this.TimeValue);
       const { data } = await this.$http.post(this.nozzle.listExtend, {
         current: this.currentPage,
         data: {
@@ -554,7 +718,6 @@
             })
             .then(res => {
               this.yzaddflag = false;
-              this.getlistExtend();
             });
         }
       });
@@ -583,19 +746,18 @@
     // 添加站点
     addform(formName) {
       this.yzaddflag = true;
+      // 获取地区列表
       this.title = "新增站点";
     },
     // 操作里面的修改弹窗
     EditFZ(index, rows) {
       // 获取地区列表
-      // console.log(rows);
       for (let key in rows) {
         if (key === "stationType") {
           rows[key] = rows[key].toString();
         }
         this.ruleForm[key] = rows[key];
       }
-      // console.log(this.ruleForm);
       this.yzaddflag = true;
       this.title = "修改站点";
       this.FenZuflag2type = 2;
@@ -616,9 +778,79 @@
           siteType: "site_type"
         }
       });
-
       this.siteTypeList = data.data;
     },
+    //获取当前用户所绑定的项目
+    getCurrentUserProject() {
+      this.$http
+        .post(this.nozzle.sysPlatformList, {
+          current: 0,
+          size: 0,
+          data: { searchStr: "", startDate: "", endDate: "" }
+        })
+        .then(res => {
+          if (res.data.code === 1) {
+            this.projectList = res.data.data.list.map(item => {
+              return {
+                id: item.id,
+                key: item.name,
+                value: item.platformCode
+              };
+            });
+          }
+        });
+    },
+    //点击事件
+    handleClick(event, data, index) {
+      switch (event) {
+        //查看关联设备
+        case "look":
+          this.dialogInfo.visible = true;
+          this.dialogInfo.type = event;
+          this.deviceTableInfo.data = data.equips;
+          this.needHandleSiteCode = data.stCode;
+          break;
+        //解绑设备与站点
+        case "remove":
+          this.$confirm("此操作将解除设备和站点的绑定关系, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+            .then(res => {
+              const params = {
+                data: {
+                  siteCode: this.needHandleSiteCode,
+                  equipNos: [data.equipNo]
+                }
+              };
+              this.$http
+                .post(this.nozzle.sysEquipRemoveBatch, params)
+                .then(res => {
+                  if (res.data.code === 1 || res.data.code === 200) {
+                    this.deviceTableInfo.data.splice(index, 1);
+                    this.getlistExtend();
+                  }
+                  this.$message({
+                    message: res.data.msg,
+                    type: res.data.code === 1 ? "success" : "error",
+                    showClose: true
+                  });
+                })
+                .catch(e => {
+                  message(e);
+                });
+            })
+            .catch(() => {});
+          break;
+        //关闭
+        case "close":
+          setTimeout(() => {
+            this.dialogInfo.visible = false;
+          }, 0);
+          break;
+      }
+    },
     // 关闭弹框后做的操作
     closedialog(formName) {
       this.$refs["ruleForm"].resetFields();
@@ -648,7 +880,7 @@
       };
       this.$refs.cascader.$refs.panel.activePath = [];
       this.$refs.cascader.$refs.panel.clearCheckedNodes();
-      this.getlistExtend();
+      // this.getlistExtend();
     },
     handleChange(value) {
       // 取选中数组的最后一项的id
diff --git a/src/components/ConfigManager/device.vue b/src/components/ConfigManager/device.vue
new file mode 100644
index 0000000..f800811
--- /dev/null
+++ b/src/components/ConfigManager/device.vue
@@ -0,0 +1,297 @@
+<template>
+  <div class="page-data">
+    <!--搜素框-->
+    <div class="page-filter">
+      <page-filter
+        :query.sync="deviceFilterInfo.query"
+        :filter-list="deviceFilterInfo.list"
+        @handleClick="handleClick"
+      />
+    </div>
+    <div class="page-content">
+      <!--表格-->
+      <div class="h-100">
+        <page-table
+          tabIndex
+          pagination
+          :api-url="deviceTableInfo.url"
+          :refresh="deviceTableInfo.refresh"
+          :data.sync="deviceTableInfo.data"
+          :query="deviceFilterInfo.query"
+          :page-query="deviceTableInfo.pageQuery"
+          :list-type-info="listTypeInfo"
+          :init-curpage="deviceTableInfo.initCurpage"
+          :field-list="deviceTableInfo.fieldList"
+          :handle="deviceTableInfo.handle"
+          @handleClick="handleClick"
+        >
+          <template v-slot:col-status="scope">
+            <el-button type="text" size="small" :class="[scope.row.status === 1 ? '' : 'red']">
+              {{ scope.row.status === 1 ? "管理中" : "未管理" }}
+            </el-button>
+          </template>
+        </page-table>
+      </div>
+    </div>
+    <!--弹窗-->
+    <page-dialog
+      :title="dialogInfo.title[dialogInfo.type]"
+      :visible.sync="dialogInfo.visible"
+      :width="dialogInfo.width"
+      :bt-loading="dialogInfo.btLoading"
+      :bt-list="dialogInfo.btList"
+      @handleClick="handleClick"
+    >
+      <page-form
+        :ref-obj.sync="formInfo.ref"
+        :data="formInfo.data"
+        :field-list="formInfo.fieldList"
+        :rules="formInfo.rules"
+        :label-width="formInfo.labelWidth"
+        :list-type-info="listTypeInfo"
+        @handleClick="handleClick"
+      />
+    </page-dialog>
+  </div>
+</template>
+
+<script>
+import { message } from "./../../util/item";
+export default {
+  data() {
+    // 验证电话
+    let checkPhone = (rule, value, callback) => {
+      let check = this.$validate({ label: "电话", value, rules: ["phone"] });
+      if (!check.result) {
+        callback(new Error(check.message));
+      } else {
+        callback();
+      }
+    };
+    return {
+      //设备搜索相关
+      deviceFilterInfo: {
+        query: {
+          searchStr: "",
+          startDate: "",
+          endDate: ""
+        },
+        list: [
+          {type: "input", label: "设备名称/编号", value: "searchStr", hideLabel: true },
+          {type: "date", label: "开始时间", value: "startDate", dateType: "date", datePickerOptions: "pickerOptionsStart", hideLabel: true},
+          {type: "date", label: "结束时间", value: "endDate", dateType: "date", datePickerOptions: "pickerOptionsEnd", hideLabel: true},
+          {type: "button", label: "查询", btType: "primary", icon: "", event: "search", show: true},
+          {type: "button", label: "添加设备", btType: "primary", icon: "", event: "create", show: true, has: "m11-3-1"}
+        ]
+      },
+      //设备表格相关
+      deviceTableInfo: {
+        url: this.nozzle.sysEquipList, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [
+          {equipNo:1000,equipDesc:"3333",equipFactory:'4444'}
+        ],
+        fieldList: [
+          { label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
+          { label: "设备描述", value: "equipDesc", minWidth: 150, tooltip: true },
+          { label: "设备厂家", value: "equipFactory", minWidth: 150, tooltip: true },
+          { label: "厂家简称", value: "equipFactoryAbb", minWidth: 100, tooltip: true },
+          { label: "联系人", value: "contactName", width: 100 },
+          { label: "电话", value: "contactMobile", width: 120 },
+          { label: "站点编号", value: "siteCode", minWidth: 100, tooltip: true },
+          { label: "更新时间", value: "updateTime", minWidth: 150, tooltip: true }
+        ],
+        handle: {
+          fixed: "right",
+          label: "操作",
+          width: "120",
+          btList: [
+            { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-3-2' },
+            { label: "删除", size: "small", type: "text", event: "delete", show: true, has: 'm11-3-3' }
+          ]
+        }
+      },
+      //设备表单相关
+      formInfo: {
+        ref: null,
+        data: {
+          id: undefined,
+          equipNo: "",
+          equipDesc: "",
+          equipFactory: "",
+          equipFactoryAbb: "",
+          contactName: "",
+          contactMobile: "",
+          siteCode: ""
+        },
+        fieldList: [
+          { label: "设备编号", value: "equipNo", type: "input", required: true },
+          { label: "设备描述", value: "equipDesc", type: "input", required: true },
+          { label: "设备厂家", value: "equipFactory", type: "input", required: true },
+          { label: "厂家简称", value: "equipFactoryAbb", type: "input", required: true },
+          { label: "联系人", value: "contactName", type: "input", required: true },
+          { label: "电话", value: "contactMobile", type: "input", required: true, validator: checkPhone },
+          { label: "站点编号", value: "siteCode", type: "select", list: "siteList", filterable:true, required: true },
+        ],
+        rules: {},
+      },
+      //列表相关
+      listTypeInfo:{
+        siteList:[]
+      },
+      //弹窗相关
+      dialogInfo:{
+        title: {
+          update: '编辑设备',
+          create: '添加设备'
+        },
+        width: '500px',
+        visible: false,
+        btLoading: false,
+        type: '',
+        btList: [
+          {label:'关闭',type:'',icon:'',event:'close',show:true},
+          {label:'保存',type:'primary',icon:'',event:'save',show:true,loading:true}
+        ]
+      },
+    }
+  },
+  watch: {
+    "dialogInfo.visible"(val) {
+      if (!val) {
+        if (this.formInfo.ref) {
+          this.formInfo.ref.resetFields();
+        }
+        this.resetForm();
+        this.btnLoading = false;
+      }
+    },
+  },
+  created() {
+    this.initSiteData();
+  },
+  mounted() {
+    this.initRules();
+    this.deviceTableInfo.refresh = Math.random();
+  },
+  methods: {
+    //初始化验证
+    initRules() {
+      const formInfo = this.formInfo;
+      formInfo.rules = this.$initRules(formInfo.fieldList);
+    },
+    //初始化站点数据
+    initSiteData() {
+      this.$http.post(this.nozzle.listExtend, {
+        current: 0,
+        data: {searchStr: "",startDate: "",endDate: ""},
+        size: 0
+      }).then(res =>{
+        if(res.data.code === 1) {
+          this.listTypeInfo.siteList = res.data.data.list.map(item =>{
+            return {
+              key: item.stName,
+              value: item.stCode
+            }
+          })
+        }
+      })
+    },
+    //点击事件
+    handleClick(event, data) {
+      switch (event) {
+        //设备搜索
+        case "search":
+          this.deviceTableInfo.initCurpage = Math.random();
+          this.deviceTableInfo.refresh = Math.random();
+          break;
+        //设备添加按钮
+        case "create":
+          this.dialogInfo.type = event;
+          this.dialogInfo.visible = true;
+          break;
+        //编辑设备按钮
+        case "update":
+          this.dialogInfo.type = event;
+          this.dialogInfo.visible = true;
+          for (let key in data) {
+            if (key in this.formInfo.data) {
+              this.formInfo.data[key] = data[key];
+            }
+          }
+          break;
+        //删除设备按钮
+        case "delete":
+          this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(res =>{
+            this.$http.post(this.nozzle.sysEquipDelete,{data:{equipNo:data.equipNo}}).then(res =>{
+              if(res.data.code === 1 || res.data.code === 200) {
+                this.deviceTableInfo.refresh = Math.random();
+                this.deviceTableInfo.initCurpage = Math.random();
+              }
+              this.$message({
+                message: res.data.msg,
+                type: res.data.code === 1 ? 'success' : 'error',
+                showClose: true,
+              })
+            }).catch(e =>{
+              message(e);
+            })
+          }).catch(() =>{})
+          break;
+        //关闭
+        case "close":
+          setTimeout(() => {
+            this.dialogInfo.visible = false;
+          }, 0);
+          break;
+        //保存表单
+        case "save":
+          const type = this.dialogInfo.type;
+          this.formInfo.ref.validate(valid => {
+            if (valid) {
+              this.btnLoading = true;
+              const params = {
+                data: this.formInfo.data
+              }
+              this.$http.post(this.nozzle.sysEquipAddUpdate, params).then(res => {
+                if (res.data.code === 1 || res.data.code === 200) {
+                  this.dialogInfo.visible = false;
+                  this.deviceTableInfo.refresh = Math.random();
+                }
+                this.$message({
+                  message: res.data.msg,
+                  type: res.data.code === 1 ? "success" : "error",
+                  showClose: true
+                });
+                this.btnLoading = false;
+              })
+              .catch(e => {
+                console.log(e);
+                this.btnLoading = false;
+              });
+            }
+          });
+          break;
+      }
+    },
+    //重置表单
+    resetForm() {
+      this.formInfo.data = {
+        id: undefined,
+        equipNo: "",
+        equipDesc: "",
+        equipFactory: "",
+        equipFactoryAbb: "",
+        contactName: "",
+        contactMobile: "",
+        siteCode: ""
+      }
+    },
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index da934e0..065f3da 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -989,22 +989,6 @@
 </script>
 
 <style lang="scss" scoped>
-.page-data {
-  @include fd();
-}
-.page-filter {
-  text-align: left;
-}
-.page-content {
-  flex: 1;
-  overflow: hidden;
-  .page-table {
-    height: 100%;
-  }
-  .red {
-    color: red;
-  }
-}
 .btn-group {
   height: 100%;
   @include fdaj(center, center);
diff --git a/src/components/common/PageTable/index.vue b/src/components/common/PageTable/index.vue
index aade3fc..0536b03 100644
--- a/src/components/common/PageTable/index.vue
+++ b/src/components/common/PageTable/index.vue
@@ -87,7 +87,7 @@
               v-has="item.has ? item.has : ''"
               :disabled="item.disabled"
               :loading="scope.row[item.loading]"
-              @click="handleClick(item.event, scope.row)"
+              @click="handleClick(item.event, scope.row, scope.$index)"
             >
               {{ item.label }}
             </el-button>
@@ -102,7 +102,7 @@
         layout="total, sizes, prev, pager, next, jumper"
         :total="listInfo.total"
         :pager-count="5"
-        :page-sizes="[20, 50, 100, 500, 1000]"
+        :page-sizes="[10, 50, 100, 500, 1000]"
         :page-size="listInfo.query.size"
         :current-page.sync="listInfo.query.current"
         @current-change="handleCurrentChange"
@@ -207,7 +207,7 @@
         loading:false,  //加载动画
         query:{ //查询条件
           current:1,  //当前页
-          size:20,  //每页条数
+          size:10,  //每页条数
         }
       },
     }
@@ -250,8 +250,8 @@
       this.$emit('handleEvent', this.type, rows);
     },
     //派发按钮点击事件
-    handleClick(event, data){
-      this.$emit('handleClick', event, data);
+    handleClick(event, data, index){
+      this.$emit('handleClick', event, data, index);
     },
     /**
       * 通过key找到在列表中对应的显示
diff --git a/src/components/configure/RtuConfig.vue b/src/components/configure/RtuConfig.vue
index c323511..41964ed 100644
--- a/src/components/configure/RtuConfig.vue
+++ b/src/components/configure/RtuConfig.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="content">
+  <div class="content">
     <div
       v-if="formAll && formAllBody && formAllBody.length"
       style="text-align:left;padding:10px"
@@ -865,75 +865,105 @@
   // }
 };
 </script>
-<style scoped>
-#content{
+<style lang="scss" scoped>
+.content{
     width: 100% !important;
     height: 100% !important;
+    #navMenuContent {
+      /* height: calc(100% - 20px);
+      width: calc(100% - 20px);
+      float: left;
+      border: 1px solid aqua;
+      box-sizing: border-box;
+      margin: 10px;
+      position: relative; */
+      width: 100%;
+      /* background-color: #fff; */
+    }
+    /deep/ .switchContent {
+      // color: rgb(99, 96, 96);
+      color: red;
+      /* background-color: #fff; */
+      /* background-color: #fff; */
+      // color: white !important;
+      
+      padding: 2%;
+      .el-form-item__content .el-input .el-input__inner {
+        color: var(--white);
+      }
+      .el-form-item .el-form-item__label{
+        color: var(--white);
+      }
+      .el-form-item__content i{
+          font-style:normal !important;
+          padding-right: 5px !important;
+      }
+      .el-form-item, .el-form-item-input{
+        margin:11px 0 11px 0 !important;
+      }
+      .rowClass .subTitle {
+        /* height:40px!important; */
+        line-height:51px !important;
+        color:aqua !important;
+        /* margin-top: 11px; */
+      }
+      .el-col .input-switch .el-form-item-input{
+        /* display: flex; */
+        margin: initial !important;
+      }
+      .rowClass .el-col{
+        height: 51px !important;
+      }
+      .form-switch .el-form-item__label{
+        width: 180px !important;
+      }
+     .form-switch .el-form-item__content{
+        width: 150px !important;
+        margin-left: 150px !important;
+      }
+      .input-switch .el-form-item__content{
+        margin-left: 0 !important;
+      }
+      .input-switch-div{
+        position:absolute !important;
+        left:0 !important;
+        top:0 !important;
+        width:1000px !important;
+        display:flex !important;
+      }
+      .el-col .input-switch-div .el-form-item__content{
+        width: 66px !important
+      }
+    }
+    // /deep/.el-menu-item{
+    //   background-color: #fff !important;
+    // }
+    /deep/ .el-menu{
+      // background-color: var(--dialogtitle)!important;
+      .el-menu-item{
+        background-color: #fff !important;
+      }
+      .el-menu-item.is-active {
+        // background-color: var(--dialogtitle)!important;
+        // background-color: #fff !important;
+      }
+      .el-menu-item:hover {
+        background-color: #fff !important;
+      }
+    } 
+    // .el-menu--horizontal>.el-menu-item.is-active{
+    //   background-color: #fff !important;
+    // }
+    // .el-menu-item .is-active {
+    //   background-color: #fff !important;
+    // }
+    // .el-menu-item:hover {
+    //   background-color: #fff !important;
+    // }
+    // /deep/ .el-menu-item {
+    //   background-color: #fff!important;
+    // }
+    
 }
-#navMenuContent {
-  /* height: calc(100% - 20px);
-  width: calc(100% - 20px);
-  float: left;
-  border: 1px solid aqua;
-  box-sizing: border-box;
-  margin: 10px;
-  position: relative; */
-  width: 100% !important;
-  /* background-color: #fff; */
-}
-.switchContent {
-  color: rgb(99, 96, 96);
-  /* background-color: #fff; */
-  /* background-color: #fff; */
-  padding: 2% !important;
-}
-.el-menu-item.is-active {
-  background-color: #fff !important;
-}
-.el-menu-item:hover {
-  background-color: #fff !important;
-}
-.el-form-item__content >>> .el-input .el-input__inner {
-  color: black !important;
-}
-.el-form-item__content >>> i{
-    font-style:normal !important;
-    padding-right: 5px !important;
-}
-.el-form-item, .el-form-item-input{
-  margin:11px 0 11px 0 !important;
-}
-.rowClass  >>> .subTitle {
-  /* height:40px!important; */
-  line-height:51px !important;
-  color:aqua !important;
-  /* margin-top: 11px; */
-}
-.el-col >>> .input-switch  .el-form-item-input{
-  /* display: flex; */
-  margin: initial !important;
-}
-.rowClass >>> .el-col{
-  height: 51px !important;
-}
-.form-switch >>> .el-form-item__label{
-  width: 180px !important;
-}
-.form-switch >>> .el-form-item__content{
-  width: 150px !important;
-  margin-left: 150px !important;
-}
-.input-switch >>> .el-form-item__content{
-  margin-left: initial !important;
-}
-.input-switch-div{
-  position:absolute !important;
-  left:0 !important;
-  top:0 !important;
-  width:1000px !important;
-  display:flex !important;
-}
-.el-col >>> .input-switch-div .el-form-item__content{
-  width: 66px !important
-}
+
 </style>

diff --git a/src/App.vue b/src/App.vue
index c80ed45..cf24765 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -23,8 +23,4 @@
   color: #2c3e50;
   height: 100%;
 }
-
-.ss {
-  color: ;
-}
 </style>
diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index 53fadc2..7f0ac82 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -68,3 +68,41 @@
 .el-textarea .el-input__count {
   background: transparent;
 }
+/****页面通用样式****/
+.page-data {
+  display: flex;
+  flex-direction: column;
+}
+.page-data .page-filter {
+  text-align: left;
+}
+.page-data .page-content,
+.el-dialog__body .page-content {
+  flex: 1;
+  overflow: hidden;
+}
+.page-data .page-content .page-table {
+  height: 100%;
+}
+.page-data .page-content .page-table .red {
+  color: red;
+}
+.page-data-dialog .el-dialog {
+  display: flex;
+  flex-direction: column;
+  height: 60%;
+  max-height: 60%;
+  margin-top: 10vh !important;
+}
+.page-data-dialog .el-dialog__body {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  padding: 20px;
+  overflow-y: auto;
+}
+.page-data-dialog .el-pagination__sizes,
+.page-data-dialog .el-pagination__total,
+.page-data-dialog .el-pagination__jump {
+  display: none;
+}
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 9fe4611..5d045c0 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -1,15 +1,12 @@
 <template>
   <div id="pagetwo">
     <div class="form">
-      <span class="SelectTitle">站点编号/站点名:</span>
       <el-input
         v-model="searchStr"
         placeholder="请输入站点编号或站点名称"
         clearable
         @change="handleChangeSearch"
       ></el-input>
-      <span class="SelectTitle">时间选择:</span>
-
       <el-date-picker
         v-model="startDate"
         value-format="yyyy-MM-dd"
@@ -43,39 +40,20 @@
     </div>
 
     <el-table :data="listExtend" style="width: 100%; height: calc(100% - 82px)">
-      <el-table-column
-        type="index"
-        label="序号"
-        max-
-        width="70"
-      ></el-table-column>
+      <el-table-column type="index" label="序号" width="70"></el-table-column>
       <el-table-column
         prop="stCode"
         label="站点编号"
-        max-width="130"
+        max-width="120"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
         prop="stName"
         label="站点名称"
         show-overflow-tooltip
-        max-width="200"
-      ></el-table-column>
-      <el-table-column
-        prop="createTime"
-        label="站点安装时间"
-        max-width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="person"
-        label="安装人"
         max-width="150"
       ></el-table-column>
-      <el-table-column
-        prop="tt"
-        label="首次数据接入时间"
-        max-width="180"
-      ></el-table-column>
-      <el-table-column label="站点类型" max-width="150">
+      <el-table-column label="站点类型" width="120">
         <template slot-scope="scope">
           <div>
             <span v-if="scope.row.stationType == 0">水质站</span>
@@ -84,7 +62,36 @@
           </div>
         </template></el-table-column
       >
-      <el-table-column label="操作" max-width="150">
+      <el-table-column
+        prop="createTime"
+        label="站点安装时间"
+        max-width="180"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="person"
+        label="安装人"
+        width="120"
+      ></el-table-column>
+      <el-table-column label="关联设备" width="80">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            size="small"
+            v-if="scope.row.equips.length"
+            @click="handleClick('look', scope.row)"
+            >查看设备</el-button
+          >
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="tt"
+        label="首次数据接入时间"
+        max-width="180"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column label="操作" width="80">
         <template slot-scope="scope">
           <el-button
             type="text"
@@ -129,7 +136,7 @@
               class="selectInput"
               size="small"
               v-model="ruleForm.stationType"
-              placeholder="请选择"
+              placeholder="请选择站点类型"
             >
               <el-option
                 class="selectOption"
@@ -141,6 +148,23 @@
             </el-select>
             <span>按实际设备类型选择站点类型</span>
           </el-form-item>
+          <el-form-item label="所属项目" prop="platformCode">
+            <el-select
+              class="selectInput"
+              size="small"
+              filterable
+              v-model="ruleForm.platformCode"
+              placeholder="请选择所属项目"
+            >
+              <el-option
+                class="selectOption"
+                v-for="item in projectList"
+                :key="item.id"
+                :label="item.key"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="所属区域" prop="area">
             <el-cascader
               ref="cascader"
@@ -149,6 +173,7 @@
               v-model="ruleForm.area"
               :options="syscityList"
               filterable
+              placeholder="请选择所属区域"
               :props="syscityListProps"
               @change="handleChange"
               @visible-change="visiblechange"
@@ -238,7 +263,28 @@
         <el-button type="primary" @click="saveOru('ruleForm')">保存</el-button>
       </span>
     </el-dialog>
-
+    <!--关联设备弹窗-->
+    <page-dialog
+      class="page-data-dialog"
+      :title="dialogInfo.title[dialogInfo.type]"
+      :visible.sync="dialogInfo.visible"
+      :width="dialogInfo.width"
+      :bt-loading="dialogInfo.btLoading"
+      :bt-list="dialogInfo.btList"
+      @handleClick="handleClick"
+    >
+      <page-table
+        tabIndex
+        :api-url="deviceTableInfo.url"
+        :refresh="deviceTableInfo.refresh"
+        :data.sync="deviceTableInfo.data"
+        :query="deviceFilterInfo.query"
+        :init-curpage="deviceTableInfo.initCurpage"
+        :field-list="deviceTableInfo.fieldList"
+        :handle="deviceTableInfo.handle"
+        @handleClick="handleClick"
+      />
+    </page-dialog>
     <el-pagination
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
@@ -328,6 +374,13 @@
             trigger: "change"
           }
         ],
+        platformCode: [
+          {
+            required: true,
+            message: "请选择所属项目",
+            trigger: "change"
+          }
+        ],
         stName: [
           {
             required: true,
@@ -374,13 +427,119 @@
       value: [],
       // 站点管理/所属区域数组
       syscityList: [],
-      syscityListProps: { checkStrictly: true, value: "id", label: "name" }
+      syscityListProps: { checkStrictly: true, value: "id", label: "name" },
+      //当前用户权限内的项目数据
+      projectList: [],
+      //弹窗相关
+      dialogInfo: {
+        title: {
+          look: "关联设备列表"
+        },
+        width: "60%",
+        visible: false,
+        btLoading: false,
+        type: "",
+        btList: [
+          { label: "关闭", type: "", icon: "", event: "close", show: true }
+        ]
+      },
+      //设备搜索相关
+      deviceFilterInfo: {
+        query: {
+          searchStr: "",
+          startDate: "",
+          endDate: ""
+        },
+        list: [
+          {
+            type: "input",
+            label: "设备名称/编号",
+            value: "searchStr",
+            hideLabel: true
+          },
+          {
+            type: "date",
+            label: "开始时间",
+            value: "startDate",
+            dateType: "date",
+            datePickerOptions: "pickerOptionsStart",
+            hideLabel: true
+          },
+          {
+            type: "date",
+            label: "结束时间",
+            value: "endDate",
+            dateType: "date",
+            datePickerOptions: "pickerOptionsEnd",
+            hideLabel: true
+          },
+          {
+            type: "button",
+            label: "查询",
+            btType: "primary",
+            icon: "",
+            event: "search",
+            show: true
+          },
+          {
+            type: "button",
+            label: "添加设备",
+            btType: "primary",
+            icon: "",
+            event: "create",
+            show: true,
+            has: "m11-3-1"
+          }
+        ]
+      },
+      //设备表格相关
+      deviceTableInfo: {
+        url: "", //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [],
+        fieldList: [
+          { label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
+          {
+            label: "设备描述",
+            value: "equipDesc",
+            minWidth: 150,
+            tooltip: true
+          },
+          {
+            label: "设备厂家",
+            value: "equipFactory",
+            minWidth: 150,
+            tooltip: true
+          },
+          { label: "联系人", value: "contactName", width: 100 },
+          { label: "电话", value: "contactMobile", width: 120 }
+        ],
+        handle: {
+          fixed: "right",
+          label: "操作",
+          width: "80",
+          btList: [
+            {
+              label: "解绑",
+              size: "small",
+              type: "text",
+              event: "remove",
+              show: true,
+              has: "m11-3-3"
+            }
+          ]
+        }
+      },
+      //需要进行操作的站点Code
+      needHandleSiteCode: ""
     };
   },
   mounted() {
     this.getsyscityList();
     this.getlistExtend();
     this.getsityType();
+    this.getCurrentUserProject(); //获取当前用户所绑定的项目
   },
   watch: {
     "ruleForm.area": {
@@ -406,6 +565,12 @@
           this.dialogImageUrl = "";
         }
       }
+    },
+    "dialogInfo.visible"(val) {
+      if (!val) {
+        this.deviceTableInfo.data = [];
+        this.dialogInfo.btLoading = false;
+      }
     }
   },
   methods: {
@@ -523,7 +688,6 @@
     },
     // 获取站点列表
     async getlistExtend() {
-      // console.log(this.TimeValue);
       const { data } = await this.$http.post(this.nozzle.listExtend, {
         current: this.currentPage,
         data: {
@@ -554,7 +718,6 @@
             })
             .then(res => {
               this.yzaddflag = false;
-              this.getlistExtend();
             });
         }
       });
@@ -583,19 +746,18 @@
     // 添加站点
     addform(formName) {
       this.yzaddflag = true;
+      // 获取地区列表
       this.title = "新增站点";
     },
     // 操作里面的修改弹窗
     EditFZ(index, rows) {
       // 获取地区列表
-      // console.log(rows);
       for (let key in rows) {
         if (key === "stationType") {
           rows[key] = rows[key].toString();
         }
         this.ruleForm[key] = rows[key];
       }
-      // console.log(this.ruleForm);
       this.yzaddflag = true;
       this.title = "修改站点";
       this.FenZuflag2type = 2;
@@ -616,9 +778,79 @@
           siteType: "site_type"
         }
       });
-
       this.siteTypeList = data.data;
     },
+    //获取当前用户所绑定的项目
+    getCurrentUserProject() {
+      this.$http
+        .post(this.nozzle.sysPlatformList, {
+          current: 0,
+          size: 0,
+          data: { searchStr: "", startDate: "", endDate: "" }
+        })
+        .then(res => {
+          if (res.data.code === 1) {
+            this.projectList = res.data.data.list.map(item => {
+              return {
+                id: item.id,
+                key: item.name,
+                value: item.platformCode
+              };
+            });
+          }
+        });
+    },
+    //点击事件
+    handleClick(event, data, index) {
+      switch (event) {
+        //查看关联设备
+        case "look":
+          this.dialogInfo.visible = true;
+          this.dialogInfo.type = event;
+          this.deviceTableInfo.data = data.equips;
+          this.needHandleSiteCode = data.stCode;
+          break;
+        //解绑设备与站点
+        case "remove":
+          this.$confirm("此操作将解除设备和站点的绑定关系, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+            .then(res => {
+              const params = {
+                data: {
+                  siteCode: this.needHandleSiteCode,
+                  equipNos: [data.equipNo]
+                }
+              };
+              this.$http
+                .post(this.nozzle.sysEquipRemoveBatch, params)
+                .then(res => {
+                  if (res.data.code === 1 || res.data.code === 200) {
+                    this.deviceTableInfo.data.splice(index, 1);
+                    this.getlistExtend();
+                  }
+                  this.$message({
+                    message: res.data.msg,
+                    type: res.data.code === 1 ? "success" : "error",
+                    showClose: true
+                  });
+                })
+                .catch(e => {
+                  message(e);
+                });
+            })
+            .catch(() => {});
+          break;
+        //关闭
+        case "close":
+          setTimeout(() => {
+            this.dialogInfo.visible = false;
+          }, 0);
+          break;
+      }
+    },
     // 关闭弹框后做的操作
     closedialog(formName) {
       this.$refs["ruleForm"].resetFields();
@@ -648,7 +880,7 @@
       };
       this.$refs.cascader.$refs.panel.activePath = [];
       this.$refs.cascader.$refs.panel.clearCheckedNodes();
-      this.getlistExtend();
+      // this.getlistExtend();
     },
     handleChange(value) {
       // 取选中数组的最后一项的id
diff --git a/src/components/ConfigManager/device.vue b/src/components/ConfigManager/device.vue
new file mode 100644
index 0000000..f800811
--- /dev/null
+++ b/src/components/ConfigManager/device.vue
@@ -0,0 +1,297 @@
+<template>
+  <div class="page-data">
+    <!--搜素框-->
+    <div class="page-filter">
+      <page-filter
+        :query.sync="deviceFilterInfo.query"
+        :filter-list="deviceFilterInfo.list"
+        @handleClick="handleClick"
+      />
+    </div>
+    <div class="page-content">
+      <!--表格-->
+      <div class="h-100">
+        <page-table
+          tabIndex
+          pagination
+          :api-url="deviceTableInfo.url"
+          :refresh="deviceTableInfo.refresh"
+          :data.sync="deviceTableInfo.data"
+          :query="deviceFilterInfo.query"
+          :page-query="deviceTableInfo.pageQuery"
+          :list-type-info="listTypeInfo"
+          :init-curpage="deviceTableInfo.initCurpage"
+          :field-list="deviceTableInfo.fieldList"
+          :handle="deviceTableInfo.handle"
+          @handleClick="handleClick"
+        >
+          <template v-slot:col-status="scope">
+            <el-button type="text" size="small" :class="[scope.row.status === 1 ? '' : 'red']">
+              {{ scope.row.status === 1 ? "管理中" : "未管理" }}
+            </el-button>
+          </template>
+        </page-table>
+      </div>
+    </div>
+    <!--弹窗-->
+    <page-dialog
+      :title="dialogInfo.title[dialogInfo.type]"
+      :visible.sync="dialogInfo.visible"
+      :width="dialogInfo.width"
+      :bt-loading="dialogInfo.btLoading"
+      :bt-list="dialogInfo.btList"
+      @handleClick="handleClick"
+    >
+      <page-form
+        :ref-obj.sync="formInfo.ref"
+        :data="formInfo.data"
+        :field-list="formInfo.fieldList"
+        :rules="formInfo.rules"
+        :label-width="formInfo.labelWidth"
+        :list-type-info="listTypeInfo"
+        @handleClick="handleClick"
+      />
+    </page-dialog>
+  </div>
+</template>
+
+<script>
+import { message } from "./../../util/item";
+export default {
+  data() {
+    // 验证电话
+    let checkPhone = (rule, value, callback) => {
+      let check = this.$validate({ label: "电话", value, rules: ["phone"] });
+      if (!check.result) {
+        callback(new Error(check.message));
+      } else {
+        callback();
+      }
+    };
+    return {
+      //设备搜索相关
+      deviceFilterInfo: {
+        query: {
+          searchStr: "",
+          startDate: "",
+          endDate: ""
+        },
+        list: [
+          {type: "input", label: "设备名称/编号", value: "searchStr", hideLabel: true },
+          {type: "date", label: "开始时间", value: "startDate", dateType: "date", datePickerOptions: "pickerOptionsStart", hideLabel: true},
+          {type: "date", label: "结束时间", value: "endDate", dateType: "date", datePickerOptions: "pickerOptionsEnd", hideLabel: true},
+          {type: "button", label: "查询", btType: "primary", icon: "", event: "search", show: true},
+          {type: "button", label: "添加设备", btType: "primary", icon: "", event: "create", show: true, has: "m11-3-1"}
+        ]
+      },
+      //设备表格相关
+      deviceTableInfo: {
+        url: this.nozzle.sysEquipList, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [
+          {equipNo:1000,equipDesc:"3333",equipFactory:'4444'}
+        ],
+        fieldList: [
+          { label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
+          { label: "设备描述", value: "equipDesc", minWidth: 150, tooltip: true },
+          { label: "设备厂家", value: "equipFactory", minWidth: 150, tooltip: true },
+          { label: "厂家简称", value: "equipFactoryAbb", minWidth: 100, tooltip: true },
+          { label: "联系人", value: "contactName", width: 100 },
+          { label: "电话", value: "contactMobile", width: 120 },
+          { label: "站点编号", value: "siteCode", minWidth: 100, tooltip: true },
+          { label: "更新时间", value: "updateTime", minWidth: 150, tooltip: true }
+        ],
+        handle: {
+          fixed: "right",
+          label: "操作",
+          width: "120",
+          btList: [
+            { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-3-2' },
+            { label: "删除", size: "small", type: "text", event: "delete", show: true, has: 'm11-3-3' }
+          ]
+        }
+      },
+      //设备表单相关
+      formInfo: {
+        ref: null,
+        data: {
+          id: undefined,
+          equipNo: "",
+          equipDesc: "",
+          equipFactory: "",
+          equipFactoryAbb: "",
+          contactName: "",
+          contactMobile: "",
+          siteCode: ""
+        },
+        fieldList: [
+          { label: "设备编号", value: "equipNo", type: "input", required: true },
+          { label: "设备描述", value: "equipDesc", type: "input", required: true },
+          { label: "设备厂家", value: "equipFactory", type: "input", required: true },
+          { label: "厂家简称", value: "equipFactoryAbb", type: "input", required: true },
+          { label: "联系人", value: "contactName", type: "input", required: true },
+          { label: "电话", value: "contactMobile", type: "input", required: true, validator: checkPhone },
+          { label: "站点编号", value: "siteCode", type: "select", list: "siteList", filterable:true, required: true },
+        ],
+        rules: {},
+      },
+      //列表相关
+      listTypeInfo:{
+        siteList:[]
+      },
+      //弹窗相关
+      dialogInfo:{
+        title: {
+          update: '编辑设备',
+          create: '添加设备'
+        },
+        width: '500px',
+        visible: false,
+        btLoading: false,
+        type: '',
+        btList: [
+          {label:'关闭',type:'',icon:'',event:'close',show:true},
+          {label:'保存',type:'primary',icon:'',event:'save',show:true,loading:true}
+        ]
+      },
+    }
+  },
+  watch: {
+    "dialogInfo.visible"(val) {
+      if (!val) {
+        if (this.formInfo.ref) {
+          this.formInfo.ref.resetFields();
+        }
+        this.resetForm();
+        this.btnLoading = false;
+      }
+    },
+  },
+  created() {
+    this.initSiteData();
+  },
+  mounted() {
+    this.initRules();
+    this.deviceTableInfo.refresh = Math.random();
+  },
+  methods: {
+    //初始化验证
+    initRules() {
+      const formInfo = this.formInfo;
+      formInfo.rules = this.$initRules(formInfo.fieldList);
+    },
+    //初始化站点数据
+    initSiteData() {
+      this.$http.post(this.nozzle.listExtend, {
+        current: 0,
+        data: {searchStr: "",startDate: "",endDate: ""},
+        size: 0
+      }).then(res =>{
+        if(res.data.code === 1) {
+          this.listTypeInfo.siteList = res.data.data.list.map(item =>{
+            return {
+              key: item.stName,
+              value: item.stCode
+            }
+          })
+        }
+      })
+    },
+    //点击事件
+    handleClick(event, data) {
+      switch (event) {
+        //设备搜索
+        case "search":
+          this.deviceTableInfo.initCurpage = Math.random();
+          this.deviceTableInfo.refresh = Math.random();
+          break;
+        //设备添加按钮
+        case "create":
+          this.dialogInfo.type = event;
+          this.dialogInfo.visible = true;
+          break;
+        //编辑设备按钮
+        case "update":
+          this.dialogInfo.type = event;
+          this.dialogInfo.visible = true;
+          for (let key in data) {
+            if (key in this.formInfo.data) {
+              this.formInfo.data[key] = data[key];
+            }
+          }
+          break;
+        //删除设备按钮
+        case "delete":
+          this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(res =>{
+            this.$http.post(this.nozzle.sysEquipDelete,{data:{equipNo:data.equipNo}}).then(res =>{
+              if(res.data.code === 1 || res.data.code === 200) {
+                this.deviceTableInfo.refresh = Math.random();
+                this.deviceTableInfo.initCurpage = Math.random();
+              }
+              this.$message({
+                message: res.data.msg,
+                type: res.data.code === 1 ? 'success' : 'error',
+                showClose: true,
+              })
+            }).catch(e =>{
+              message(e);
+            })
+          }).catch(() =>{})
+          break;
+        //关闭
+        case "close":
+          setTimeout(() => {
+            this.dialogInfo.visible = false;
+          }, 0);
+          break;
+        //保存表单
+        case "save":
+          const type = this.dialogInfo.type;
+          this.formInfo.ref.validate(valid => {
+            if (valid) {
+              this.btnLoading = true;
+              const params = {
+                data: this.formInfo.data
+              }
+              this.$http.post(this.nozzle.sysEquipAddUpdate, params).then(res => {
+                if (res.data.code === 1 || res.data.code === 200) {
+                  this.dialogInfo.visible = false;
+                  this.deviceTableInfo.refresh = Math.random();
+                }
+                this.$message({
+                  message: res.data.msg,
+                  type: res.data.code === 1 ? "success" : "error",
+                  showClose: true
+                });
+                this.btnLoading = false;
+              })
+              .catch(e => {
+                console.log(e);
+                this.btnLoading = false;
+              });
+            }
+          });
+          break;
+      }
+    },
+    //重置表单
+    resetForm() {
+      this.formInfo.data = {
+        id: undefined,
+        equipNo: "",
+        equipDesc: "",
+        equipFactory: "",
+        equipFactoryAbb: "",
+        contactName: "",
+        contactMobile: "",
+        siteCode: ""
+      }
+    },
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index da934e0..065f3da 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -989,22 +989,6 @@
 </script>
 
 <style lang="scss" scoped>
-.page-data {
-  @include fd();
-}
-.page-filter {
-  text-align: left;
-}
-.page-content {
-  flex: 1;
-  overflow: hidden;
-  .page-table {
-    height: 100%;
-  }
-  .red {
-    color: red;
-  }
-}
 .btn-group {
   height: 100%;
   @include fdaj(center, center);
diff --git a/src/components/common/PageTable/index.vue b/src/components/common/PageTable/index.vue
index aade3fc..0536b03 100644
--- a/src/components/common/PageTable/index.vue
+++ b/src/components/common/PageTable/index.vue
@@ -87,7 +87,7 @@
               v-has="item.has ? item.has : ''"
               :disabled="item.disabled"
               :loading="scope.row[item.loading]"
-              @click="handleClick(item.event, scope.row)"
+              @click="handleClick(item.event, scope.row, scope.$index)"
             >
               {{ item.label }}
             </el-button>
@@ -102,7 +102,7 @@
         layout="total, sizes, prev, pager, next, jumper"
         :total="listInfo.total"
         :pager-count="5"
-        :page-sizes="[20, 50, 100, 500, 1000]"
+        :page-sizes="[10, 50, 100, 500, 1000]"
         :page-size="listInfo.query.size"
         :current-page.sync="listInfo.query.current"
         @current-change="handleCurrentChange"
@@ -207,7 +207,7 @@
         loading:false,  //加载动画
         query:{ //查询条件
           current:1,  //当前页
-          size:20,  //每页条数
+          size:10,  //每页条数
         }
       },
     }
@@ -250,8 +250,8 @@
       this.$emit('handleEvent', this.type, rows);
     },
     //派发按钮点击事件
-    handleClick(event, data){
-      this.$emit('handleClick', event, data);
+    handleClick(event, data, index){
+      this.$emit('handleClick', event, data, index);
     },
     /**
       * 通过key找到在列表中对应的显示
diff --git a/src/components/configure/RtuConfig.vue b/src/components/configure/RtuConfig.vue
index c323511..41964ed 100644
--- a/src/components/configure/RtuConfig.vue
+++ b/src/components/configure/RtuConfig.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="content">
+  <div class="content">
     <div
       v-if="formAll && formAllBody && formAllBody.length"
       style="text-align:left;padding:10px"
@@ -865,75 +865,105 @@
   // }
 };
 </script>
-<style scoped>
-#content{
+<style lang="scss" scoped>
+.content{
     width: 100% !important;
     height: 100% !important;
+    #navMenuContent {
+      /* height: calc(100% - 20px);
+      width: calc(100% - 20px);
+      float: left;
+      border: 1px solid aqua;
+      box-sizing: border-box;
+      margin: 10px;
+      position: relative; */
+      width: 100%;
+      /* background-color: #fff; */
+    }
+    /deep/ .switchContent {
+      // color: rgb(99, 96, 96);
+      color: red;
+      /* background-color: #fff; */
+      /* background-color: #fff; */
+      // color: white !important;
+      
+      padding: 2%;
+      .el-form-item__content .el-input .el-input__inner {
+        color: var(--white);
+      }
+      .el-form-item .el-form-item__label{
+        color: var(--white);
+      }
+      .el-form-item__content i{
+          font-style:normal !important;
+          padding-right: 5px !important;
+      }
+      .el-form-item, .el-form-item-input{
+        margin:11px 0 11px 0 !important;
+      }
+      .rowClass .subTitle {
+        /* height:40px!important; */
+        line-height:51px !important;
+        color:aqua !important;
+        /* margin-top: 11px; */
+      }
+      .el-col .input-switch .el-form-item-input{
+        /* display: flex; */
+        margin: initial !important;
+      }
+      .rowClass .el-col{
+        height: 51px !important;
+      }
+      .form-switch .el-form-item__label{
+        width: 180px !important;
+      }
+     .form-switch .el-form-item__content{
+        width: 150px !important;
+        margin-left: 150px !important;
+      }
+      .input-switch .el-form-item__content{
+        margin-left: 0 !important;
+      }
+      .input-switch-div{
+        position:absolute !important;
+        left:0 !important;
+        top:0 !important;
+        width:1000px !important;
+        display:flex !important;
+      }
+      .el-col .input-switch-div .el-form-item__content{
+        width: 66px !important
+      }
+    }
+    // /deep/.el-menu-item{
+    //   background-color: #fff !important;
+    // }
+    /deep/ .el-menu{
+      // background-color: var(--dialogtitle)!important;
+      .el-menu-item{
+        background-color: #fff !important;
+      }
+      .el-menu-item.is-active {
+        // background-color: var(--dialogtitle)!important;
+        // background-color: #fff !important;
+      }
+      .el-menu-item:hover {
+        background-color: #fff !important;
+      }
+    } 
+    // .el-menu--horizontal>.el-menu-item.is-active{
+    //   background-color: #fff !important;
+    // }
+    // .el-menu-item .is-active {
+    //   background-color: #fff !important;
+    // }
+    // .el-menu-item:hover {
+    //   background-color: #fff !important;
+    // }
+    // /deep/ .el-menu-item {
+    //   background-color: #fff!important;
+    // }
+    
 }
-#navMenuContent {
-  /* height: calc(100% - 20px);
-  width: calc(100% - 20px);
-  float: left;
-  border: 1px solid aqua;
-  box-sizing: border-box;
-  margin: 10px;
-  position: relative; */
-  width: 100% !important;
-  /* background-color: #fff; */
-}
-.switchContent {
-  color: rgb(99, 96, 96);
-  /* background-color: #fff; */
-  /* background-color: #fff; */
-  padding: 2% !important;
-}
-.el-menu-item.is-active {
-  background-color: #fff !important;
-}
-.el-menu-item:hover {
-  background-color: #fff !important;
-}
-.el-form-item__content >>> .el-input .el-input__inner {
-  color: black !important;
-}
-.el-form-item__content >>> i{
-    font-style:normal !important;
-    padding-right: 5px !important;
-}
-.el-form-item, .el-form-item-input{
-  margin:11px 0 11px 0 !important;
-}
-.rowClass  >>> .subTitle {
-  /* height:40px!important; */
-  line-height:51px !important;
-  color:aqua !important;
-  /* margin-top: 11px; */
-}
-.el-col >>> .input-switch  .el-form-item-input{
-  /* display: flex; */
-  margin: initial !important;
-}
-.rowClass >>> .el-col{
-  height: 51px !important;
-}
-.form-switch >>> .el-form-item__label{
-  width: 180px !important;
-}
-.form-switch >>> .el-form-item__content{
-  width: 150px !important;
-  margin-left: 150px !important;
-}
-.input-switch >>> .el-form-item__content{
-  margin-left: initial !important;
-}
-.input-switch-div{
-  position:absolute !important;
-  left:0 !important;
-  top:0 !important;
-  width:1000px !important;
-  display:flex !important;
-}
-.el-col >>> .input-switch-div .el-form-item__content{
-  width: 66px !important
-}
+
 </style>
diff --git a/src/components/index.vue b/src/components/index.vue
index eb7f8de..4822fc8 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -98,6 +98,9 @@
                 v-has="'m11-2'"
                 >站点管理</el-menu-item
               >
+              <el-menu-item index="/ConfigManager/device" v-has="'m11-3'"
+                >设备管理</el-menu-item
+              >
             </el-submenu>
             <el-submenu index="5" v-has="'m4'">
               <template slot="title">

diff --git a/src/App.vue b/src/App.vue
index c80ed45..cf24765 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -23,8 +23,4 @@
   color: #2c3e50;
   height: 100%;
 }
-
-.ss {
-  color: ;
-}
 </style>
diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index 53fadc2..7f0ac82 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -68,3 +68,41 @@
 .el-textarea .el-input__count {
   background: transparent;
 }
+/****页面通用样式****/
+.page-data {
+  display: flex;
+  flex-direction: column;
+}
+.page-data .page-filter {
+  text-align: left;
+}
+.page-data .page-content,
+.el-dialog__body .page-content {
+  flex: 1;
+  overflow: hidden;
+}
+.page-data .page-content .page-table {
+  height: 100%;
+}
+.page-data .page-content .page-table .red {
+  color: red;
+}
+.page-data-dialog .el-dialog {
+  display: flex;
+  flex-direction: column;
+  height: 60%;
+  max-height: 60%;
+  margin-top: 10vh !important;
+}
+.page-data-dialog .el-dialog__body {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  padding: 20px;
+  overflow-y: auto;
+}
+.page-data-dialog .el-pagination__sizes,
+.page-data-dialog .el-pagination__total,
+.page-data-dialog .el-pagination__jump {
+  display: none;
+}
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 9fe4611..5d045c0 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -1,15 +1,12 @@
 <template>
   <div id="pagetwo">
     <div class="form">
-      <span class="SelectTitle">站点编号/站点名:</span>
       <el-input
         v-model="searchStr"
         placeholder="请输入站点编号或站点名称"
         clearable
         @change="handleChangeSearch"
       ></el-input>
-      <span class="SelectTitle">时间选择:</span>
-
       <el-date-picker
         v-model="startDate"
         value-format="yyyy-MM-dd"
@@ -43,39 +40,20 @@
     </div>
 
     <el-table :data="listExtend" style="width: 100%; height: calc(100% - 82px)">
-      <el-table-column
-        type="index"
-        label="序号"
-        max-
-        width="70"
-      ></el-table-column>
+      <el-table-column type="index" label="序号" width="70"></el-table-column>
       <el-table-column
         prop="stCode"
         label="站点编号"
-        max-width="130"
+        max-width="120"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
         prop="stName"
         label="站点名称"
         show-overflow-tooltip
-        max-width="200"
-      ></el-table-column>
-      <el-table-column
-        prop="createTime"
-        label="站点安装时间"
-        max-width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="person"
-        label="安装人"
         max-width="150"
       ></el-table-column>
-      <el-table-column
-        prop="tt"
-        label="首次数据接入时间"
-        max-width="180"
-      ></el-table-column>
-      <el-table-column label="站点类型" max-width="150">
+      <el-table-column label="站点类型" width="120">
         <template slot-scope="scope">
           <div>
             <span v-if="scope.row.stationType == 0">水质站</span>
@@ -84,7 +62,36 @@
           </div>
         </template></el-table-column
       >
-      <el-table-column label="操作" max-width="150">
+      <el-table-column
+        prop="createTime"
+        label="站点安装时间"
+        max-width="180"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="person"
+        label="安装人"
+        width="120"
+      ></el-table-column>
+      <el-table-column label="关联设备" width="80">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            size="small"
+            v-if="scope.row.equips.length"
+            @click="handleClick('look', scope.row)"
+            >查看设备</el-button
+          >
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="tt"
+        label="首次数据接入时间"
+        max-width="180"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column label="操作" width="80">
         <template slot-scope="scope">
           <el-button
             type="text"
@@ -129,7 +136,7 @@
               class="selectInput"
               size="small"
               v-model="ruleForm.stationType"
-              placeholder="请选择"
+              placeholder="请选择站点类型"
             >
               <el-option
                 class="selectOption"
@@ -141,6 +148,23 @@
             </el-select>
             <span>按实际设备类型选择站点类型</span>
           </el-form-item>
+          <el-form-item label="所属项目" prop="platformCode">
+            <el-select
+              class="selectInput"
+              size="small"
+              filterable
+              v-model="ruleForm.platformCode"
+              placeholder="请选择所属项目"
+            >
+              <el-option
+                class="selectOption"
+                v-for="item in projectList"
+                :key="item.id"
+                :label="item.key"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="所属区域" prop="area">
             <el-cascader
               ref="cascader"
@@ -149,6 +173,7 @@
               v-model="ruleForm.area"
               :options="syscityList"
               filterable
+              placeholder="请选择所属区域"
               :props="syscityListProps"
               @change="handleChange"
               @visible-change="visiblechange"
@@ -238,7 +263,28 @@
         <el-button type="primary" @click="saveOru('ruleForm')">保存</el-button>
       </span>
     </el-dialog>
-
+    <!--关联设备弹窗-->
+    <page-dialog
+      class="page-data-dialog"
+      :title="dialogInfo.title[dialogInfo.type]"
+      :visible.sync="dialogInfo.visible"
+      :width="dialogInfo.width"
+      :bt-loading="dialogInfo.btLoading"
+      :bt-list="dialogInfo.btList"
+      @handleClick="handleClick"
+    >
+      <page-table
+        tabIndex
+        :api-url="deviceTableInfo.url"
+        :refresh="deviceTableInfo.refresh"
+        :data.sync="deviceTableInfo.data"
+        :query="deviceFilterInfo.query"
+        :init-curpage="deviceTableInfo.initCurpage"
+        :field-list="deviceTableInfo.fieldList"
+        :handle="deviceTableInfo.handle"
+        @handleClick="handleClick"
+      />
+    </page-dialog>
     <el-pagination
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
@@ -328,6 +374,13 @@
             trigger: "change"
           }
         ],
+        platformCode: [
+          {
+            required: true,
+            message: "请选择所属项目",
+            trigger: "change"
+          }
+        ],
         stName: [
           {
             required: true,
@@ -374,13 +427,119 @@
       value: [],
       // 站点管理/所属区域数组
       syscityList: [],
-      syscityListProps: { checkStrictly: true, value: "id", label: "name" }
+      syscityListProps: { checkStrictly: true, value: "id", label: "name" },
+      //当前用户权限内的项目数据
+      projectList: [],
+      //弹窗相关
+      dialogInfo: {
+        title: {
+          look: "关联设备列表"
+        },
+        width: "60%",
+        visible: false,
+        btLoading: false,
+        type: "",
+        btList: [
+          { label: "关闭", type: "", icon: "", event: "close", show: true }
+        ]
+      },
+      //设备搜索相关
+      deviceFilterInfo: {
+        query: {
+          searchStr: "",
+          startDate: "",
+          endDate: ""
+        },
+        list: [
+          {
+            type: "input",
+            label: "设备名称/编号",
+            value: "searchStr",
+            hideLabel: true
+          },
+          {
+            type: "date",
+            label: "开始时间",
+            value: "startDate",
+            dateType: "date",
+            datePickerOptions: "pickerOptionsStart",
+            hideLabel: true
+          },
+          {
+            type: "date",
+            label: "结束时间",
+            value: "endDate",
+            dateType: "date",
+            datePickerOptions: "pickerOptionsEnd",
+            hideLabel: true
+          },
+          {
+            type: "button",
+            label: "查询",
+            btType: "primary",
+            icon: "",
+            event: "search",
+            show: true
+          },
+          {
+            type: "button",
+            label: "添加设备",
+            btType: "primary",
+            icon: "",
+            event: "create",
+            show: true,
+            has: "m11-3-1"
+          }
+        ]
+      },
+      //设备表格相关
+      deviceTableInfo: {
+        url: "", //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [],
+        fieldList: [
+          { label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
+          {
+            label: "设备描述",
+            value: "equipDesc",
+            minWidth: 150,
+            tooltip: true
+          },
+          {
+            label: "设备厂家",
+            value: "equipFactory",
+            minWidth: 150,
+            tooltip: true
+          },
+          { label: "联系人", value: "contactName", width: 100 },
+          { label: "电话", value: "contactMobile", width: 120 }
+        ],
+        handle: {
+          fixed: "right",
+          label: "操作",
+          width: "80",
+          btList: [
+            {
+              label: "解绑",
+              size: "small",
+              type: "text",
+              event: "remove",
+              show: true,
+              has: "m11-3-3"
+            }
+          ]
+        }
+      },
+      //需要进行操作的站点Code
+      needHandleSiteCode: ""
     };
   },
   mounted() {
     this.getsyscityList();
     this.getlistExtend();
     this.getsityType();
+    this.getCurrentUserProject(); //获取当前用户所绑定的项目
   },
   watch: {
     "ruleForm.area": {
@@ -406,6 +565,12 @@
           this.dialogImageUrl = "";
         }
       }
+    },
+    "dialogInfo.visible"(val) {
+      if (!val) {
+        this.deviceTableInfo.data = [];
+        this.dialogInfo.btLoading = false;
+      }
     }
   },
   methods: {
@@ -523,7 +688,6 @@
     },
     // 获取站点列表
     async getlistExtend() {
-      // console.log(this.TimeValue);
       const { data } = await this.$http.post(this.nozzle.listExtend, {
         current: this.currentPage,
         data: {
@@ -554,7 +718,6 @@
             })
             .then(res => {
               this.yzaddflag = false;
-              this.getlistExtend();
             });
         }
       });
@@ -583,19 +746,18 @@
     // 添加站点
     addform(formName) {
       this.yzaddflag = true;
+      // 获取地区列表
       this.title = "新增站点";
     },
     // 操作里面的修改弹窗
     EditFZ(index, rows) {
       // 获取地区列表
-      // console.log(rows);
       for (let key in rows) {
         if (key === "stationType") {
           rows[key] = rows[key].toString();
         }
         this.ruleForm[key] = rows[key];
       }
-      // console.log(this.ruleForm);
       this.yzaddflag = true;
       this.title = "修改站点";
       this.FenZuflag2type = 2;
@@ -616,9 +778,79 @@
           siteType: "site_type"
         }
       });
-
       this.siteTypeList = data.data;
     },
+    //获取当前用户所绑定的项目
+    getCurrentUserProject() {
+      this.$http
+        .post(this.nozzle.sysPlatformList, {
+          current: 0,
+          size: 0,
+          data: { searchStr: "", startDate: "", endDate: "" }
+        })
+        .then(res => {
+          if (res.data.code === 1) {
+            this.projectList = res.data.data.list.map(item => {
+              return {
+                id: item.id,
+                key: item.name,
+                value: item.platformCode
+              };
+            });
+          }
+        });
+    },
+    //点击事件
+    handleClick(event, data, index) {
+      switch (event) {
+        //查看关联设备
+        case "look":
+          this.dialogInfo.visible = true;
+          this.dialogInfo.type = event;
+          this.deviceTableInfo.data = data.equips;
+          this.needHandleSiteCode = data.stCode;
+          break;
+        //解绑设备与站点
+        case "remove":
+          this.$confirm("此操作将解除设备和站点的绑定关系, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+            .then(res => {
+              const params = {
+                data: {
+                  siteCode: this.needHandleSiteCode,
+                  equipNos: [data.equipNo]
+                }
+              };
+              this.$http
+                .post(this.nozzle.sysEquipRemoveBatch, params)
+                .then(res => {
+                  if (res.data.code === 1 || res.data.code === 200) {
+                    this.deviceTableInfo.data.splice(index, 1);
+                    this.getlistExtend();
+                  }
+                  this.$message({
+                    message: res.data.msg,
+                    type: res.data.code === 1 ? "success" : "error",
+                    showClose: true
+                  });
+                })
+                .catch(e => {
+                  message(e);
+                });
+            })
+            .catch(() => {});
+          break;
+        //关闭
+        case "close":
+          setTimeout(() => {
+            this.dialogInfo.visible = false;
+          }, 0);
+          break;
+      }
+    },
     // 关闭弹框后做的操作
     closedialog(formName) {
       this.$refs["ruleForm"].resetFields();
@@ -648,7 +880,7 @@
       };
       this.$refs.cascader.$refs.panel.activePath = [];
       this.$refs.cascader.$refs.panel.clearCheckedNodes();
-      this.getlistExtend();
+      // this.getlistExtend();
     },
     handleChange(value) {
       // 取选中数组的最后一项的id
diff --git a/src/components/ConfigManager/device.vue b/src/components/ConfigManager/device.vue
new file mode 100644
index 0000000..f800811
--- /dev/null
+++ b/src/components/ConfigManager/device.vue
@@ -0,0 +1,297 @@
+<template>
+  <div class="page-data">
+    <!--搜素框-->
+    <div class="page-filter">
+      <page-filter
+        :query.sync="deviceFilterInfo.query"
+        :filter-list="deviceFilterInfo.list"
+        @handleClick="handleClick"
+      />
+    </div>
+    <div class="page-content">
+      <!--表格-->
+      <div class="h-100">
+        <page-table
+          tabIndex
+          pagination
+          :api-url="deviceTableInfo.url"
+          :refresh="deviceTableInfo.refresh"
+          :data.sync="deviceTableInfo.data"
+          :query="deviceFilterInfo.query"
+          :page-query="deviceTableInfo.pageQuery"
+          :list-type-info="listTypeInfo"
+          :init-curpage="deviceTableInfo.initCurpage"
+          :field-list="deviceTableInfo.fieldList"
+          :handle="deviceTableInfo.handle"
+          @handleClick="handleClick"
+        >
+          <template v-slot:col-status="scope">
+            <el-button type="text" size="small" :class="[scope.row.status === 1 ? '' : 'red']">
+              {{ scope.row.status === 1 ? "管理中" : "未管理" }}
+            </el-button>
+          </template>
+        </page-table>
+      </div>
+    </div>
+    <!--弹窗-->
+    <page-dialog
+      :title="dialogInfo.title[dialogInfo.type]"
+      :visible.sync="dialogInfo.visible"
+      :width="dialogInfo.width"
+      :bt-loading="dialogInfo.btLoading"
+      :bt-list="dialogInfo.btList"
+      @handleClick="handleClick"
+    >
+      <page-form
+        :ref-obj.sync="formInfo.ref"
+        :data="formInfo.data"
+        :field-list="formInfo.fieldList"
+        :rules="formInfo.rules"
+        :label-width="formInfo.labelWidth"
+        :list-type-info="listTypeInfo"
+        @handleClick="handleClick"
+      />
+    </page-dialog>
+  </div>
+</template>
+
+<script>
+import { message } from "./../../util/item";
+export default {
+  data() {
+    // 验证电话
+    let checkPhone = (rule, value, callback) => {
+      let check = this.$validate({ label: "电话", value, rules: ["phone"] });
+      if (!check.result) {
+        callback(new Error(check.message));
+      } else {
+        callback();
+      }
+    };
+    return {
+      //设备搜索相关
+      deviceFilterInfo: {
+        query: {
+          searchStr: "",
+          startDate: "",
+          endDate: ""
+        },
+        list: [
+          {type: "input", label: "设备名称/编号", value: "searchStr", hideLabel: true },
+          {type: "date", label: "开始时间", value: "startDate", dateType: "date", datePickerOptions: "pickerOptionsStart", hideLabel: true},
+          {type: "date", label: "结束时间", value: "endDate", dateType: "date", datePickerOptions: "pickerOptionsEnd", hideLabel: true},
+          {type: "button", label: "查询", btType: "primary", icon: "", event: "search", show: true},
+          {type: "button", label: "添加设备", btType: "primary", icon: "", event: "create", show: true, has: "m11-3-1"}
+        ]
+      },
+      //设备表格相关
+      deviceTableInfo: {
+        url: this.nozzle.sysEquipList, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [
+          {equipNo:1000,equipDesc:"3333",equipFactory:'4444'}
+        ],
+        fieldList: [
+          { label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
+          { label: "设备描述", value: "equipDesc", minWidth: 150, tooltip: true },
+          { label: "设备厂家", value: "equipFactory", minWidth: 150, tooltip: true },
+          { label: "厂家简称", value: "equipFactoryAbb", minWidth: 100, tooltip: true },
+          { label: "联系人", value: "contactName", width: 100 },
+          { label: "电话", value: "contactMobile", width: 120 },
+          { label: "站点编号", value: "siteCode", minWidth: 100, tooltip: true },
+          { label: "更新时间", value: "updateTime", minWidth: 150, tooltip: true }
+        ],
+        handle: {
+          fixed: "right",
+          label: "操作",
+          width: "120",
+          btList: [
+            { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-3-2' },
+            { label: "删除", size: "small", type: "text", event: "delete", show: true, has: 'm11-3-3' }
+          ]
+        }
+      },
+      //设备表单相关
+      formInfo: {
+        ref: null,
+        data: {
+          id: undefined,
+          equipNo: "",
+          equipDesc: "",
+          equipFactory: "",
+          equipFactoryAbb: "",
+          contactName: "",
+          contactMobile: "",
+          siteCode: ""
+        },
+        fieldList: [
+          { label: "设备编号", value: "equipNo", type: "input", required: true },
+          { label: "设备描述", value: "equipDesc", type: "input", required: true },
+          { label: "设备厂家", value: "equipFactory", type: "input", required: true },
+          { label: "厂家简称", value: "equipFactoryAbb", type: "input", required: true },
+          { label: "联系人", value: "contactName", type: "input", required: true },
+          { label: "电话", value: "contactMobile", type: "input", required: true, validator: checkPhone },
+          { label: "站点编号", value: "siteCode", type: "select", list: "siteList", filterable:true, required: true },
+        ],
+        rules: {},
+      },
+      //列表相关
+      listTypeInfo:{
+        siteList:[]
+      },
+      //弹窗相关
+      dialogInfo:{
+        title: {
+          update: '编辑设备',
+          create: '添加设备'
+        },
+        width: '500px',
+        visible: false,
+        btLoading: false,
+        type: '',
+        btList: [
+          {label:'关闭',type:'',icon:'',event:'close',show:true},
+          {label:'保存',type:'primary',icon:'',event:'save',show:true,loading:true}
+        ]
+      },
+    }
+  },
+  watch: {
+    "dialogInfo.visible"(val) {
+      if (!val) {
+        if (this.formInfo.ref) {
+          this.formInfo.ref.resetFields();
+        }
+        this.resetForm();
+        this.btnLoading = false;
+      }
+    },
+  },
+  created() {
+    this.initSiteData();
+  },
+  mounted() {
+    this.initRules();
+    this.deviceTableInfo.refresh = Math.random();
+  },
+  methods: {
+    //初始化验证
+    initRules() {
+      const formInfo = this.formInfo;
+      formInfo.rules = this.$initRules(formInfo.fieldList);
+    },
+    //初始化站点数据
+    initSiteData() {
+      this.$http.post(this.nozzle.listExtend, {
+        current: 0,
+        data: {searchStr: "",startDate: "",endDate: ""},
+        size: 0
+      }).then(res =>{
+        if(res.data.code === 1) {
+          this.listTypeInfo.siteList = res.data.data.list.map(item =>{
+            return {
+              key: item.stName,
+              value: item.stCode
+            }
+          })
+        }
+      })
+    },
+    //点击事件
+    handleClick(event, data) {
+      switch (event) {
+        //设备搜索
+        case "search":
+          this.deviceTableInfo.initCurpage = Math.random();
+          this.deviceTableInfo.refresh = Math.random();
+          break;
+        //设备添加按钮
+        case "create":
+          this.dialogInfo.type = event;
+          this.dialogInfo.visible = true;
+          break;
+        //编辑设备按钮
+        case "update":
+          this.dialogInfo.type = event;
+          this.dialogInfo.visible = true;
+          for (let key in data) {
+            if (key in this.formInfo.data) {
+              this.formInfo.data[key] = data[key];
+            }
+          }
+          break;
+        //删除设备按钮
+        case "delete":
+          this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(res =>{
+            this.$http.post(this.nozzle.sysEquipDelete,{data:{equipNo:data.equipNo}}).then(res =>{
+              if(res.data.code === 1 || res.data.code === 200) {
+                this.deviceTableInfo.refresh = Math.random();
+                this.deviceTableInfo.initCurpage = Math.random();
+              }
+              this.$message({
+                message: res.data.msg,
+                type: res.data.code === 1 ? 'success' : 'error',
+                showClose: true,
+              })
+            }).catch(e =>{
+              message(e);
+            })
+          }).catch(() =>{})
+          break;
+        //关闭
+        case "close":
+          setTimeout(() => {
+            this.dialogInfo.visible = false;
+          }, 0);
+          break;
+        //保存表单
+        case "save":
+          const type = this.dialogInfo.type;
+          this.formInfo.ref.validate(valid => {
+            if (valid) {
+              this.btnLoading = true;
+              const params = {
+                data: this.formInfo.data
+              }
+              this.$http.post(this.nozzle.sysEquipAddUpdate, params).then(res => {
+                if (res.data.code === 1 || res.data.code === 200) {
+                  this.dialogInfo.visible = false;
+                  this.deviceTableInfo.refresh = Math.random();
+                }
+                this.$message({
+                  message: res.data.msg,
+                  type: res.data.code === 1 ? "success" : "error",
+                  showClose: true
+                });
+                this.btnLoading = false;
+              })
+              .catch(e => {
+                console.log(e);
+                this.btnLoading = false;
+              });
+            }
+          });
+          break;
+      }
+    },
+    //重置表单
+    resetForm() {
+      this.formInfo.data = {
+        id: undefined,
+        equipNo: "",
+        equipDesc: "",
+        equipFactory: "",
+        equipFactoryAbb: "",
+        contactName: "",
+        contactMobile: "",
+        siteCode: ""
+      }
+    },
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index da934e0..065f3da 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -989,22 +989,6 @@
 </script>
 
 <style lang="scss" scoped>
-.page-data {
-  @include fd();
-}
-.page-filter {
-  text-align: left;
-}
-.page-content {
-  flex: 1;
-  overflow: hidden;
-  .page-table {
-    height: 100%;
-  }
-  .red {
-    color: red;
-  }
-}
 .btn-group {
   height: 100%;
   @include fdaj(center, center);
diff --git a/src/components/common/PageTable/index.vue b/src/components/common/PageTable/index.vue
index aade3fc..0536b03 100644
--- a/src/components/common/PageTable/index.vue
+++ b/src/components/common/PageTable/index.vue
@@ -87,7 +87,7 @@
               v-has="item.has ? item.has : ''"
               :disabled="item.disabled"
               :loading="scope.row[item.loading]"
-              @click="handleClick(item.event, scope.row)"
+              @click="handleClick(item.event, scope.row, scope.$index)"
             >
               {{ item.label }}
             </el-button>
@@ -102,7 +102,7 @@
         layout="total, sizes, prev, pager, next, jumper"
         :total="listInfo.total"
         :pager-count="5"
-        :page-sizes="[20, 50, 100, 500, 1000]"
+        :page-sizes="[10, 50, 100, 500, 1000]"
         :page-size="listInfo.query.size"
         :current-page.sync="listInfo.query.current"
         @current-change="handleCurrentChange"
@@ -207,7 +207,7 @@
         loading:false,  //加载动画
         query:{ //查询条件
           current:1,  //当前页
-          size:20,  //每页条数
+          size:10,  //每页条数
         }
       },
     }
@@ -250,8 +250,8 @@
       this.$emit('handleEvent', this.type, rows);
     },
     //派发按钮点击事件
-    handleClick(event, data){
-      this.$emit('handleClick', event, data);
+    handleClick(event, data, index){
+      this.$emit('handleClick', event, data, index);
     },
     /**
       * 通过key找到在列表中对应的显示
diff --git a/src/components/configure/RtuConfig.vue b/src/components/configure/RtuConfig.vue
index c323511..41964ed 100644
--- a/src/components/configure/RtuConfig.vue
+++ b/src/components/configure/RtuConfig.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="content">
+  <div class="content">
     <div
       v-if="formAll && formAllBody && formAllBody.length"
       style="text-align:left;padding:10px"
@@ -865,75 +865,105 @@
   // }
 };
 </script>
-<style scoped>
-#content{
+<style lang="scss" scoped>
+.content{
     width: 100% !important;
     height: 100% !important;
+    #navMenuContent {
+      /* height: calc(100% - 20px);
+      width: calc(100% - 20px);
+      float: left;
+      border: 1px solid aqua;
+      box-sizing: border-box;
+      margin: 10px;
+      position: relative; */
+      width: 100%;
+      /* background-color: #fff; */
+    }
+    /deep/ .switchContent {
+      // color: rgb(99, 96, 96);
+      color: red;
+      /* background-color: #fff; */
+      /* background-color: #fff; */
+      // color: white !important;
+      
+      padding: 2%;
+      .el-form-item__content .el-input .el-input__inner {
+        color: var(--white);
+      }
+      .el-form-item .el-form-item__label{
+        color: var(--white);
+      }
+      .el-form-item__content i{
+          font-style:normal !important;
+          padding-right: 5px !important;
+      }
+      .el-form-item, .el-form-item-input{
+        margin:11px 0 11px 0 !important;
+      }
+      .rowClass .subTitle {
+        /* height:40px!important; */
+        line-height:51px !important;
+        color:aqua !important;
+        /* margin-top: 11px; */
+      }
+      .el-col .input-switch .el-form-item-input{
+        /* display: flex; */
+        margin: initial !important;
+      }
+      .rowClass .el-col{
+        height: 51px !important;
+      }
+      .form-switch .el-form-item__label{
+        width: 180px !important;
+      }
+     .form-switch .el-form-item__content{
+        width: 150px !important;
+        margin-left: 150px !important;
+      }
+      .input-switch .el-form-item__content{
+        margin-left: 0 !important;
+      }
+      .input-switch-div{
+        position:absolute !important;
+        left:0 !important;
+        top:0 !important;
+        width:1000px !important;
+        display:flex !important;
+      }
+      .el-col .input-switch-div .el-form-item__content{
+        width: 66px !important
+      }
+    }
+    // /deep/.el-menu-item{
+    //   background-color: #fff !important;
+    // }
+    /deep/ .el-menu{
+      // background-color: var(--dialogtitle)!important;
+      .el-menu-item{
+        background-color: #fff !important;
+      }
+      .el-menu-item.is-active {
+        // background-color: var(--dialogtitle)!important;
+        // background-color: #fff !important;
+      }
+      .el-menu-item:hover {
+        background-color: #fff !important;
+      }
+    } 
+    // .el-menu--horizontal>.el-menu-item.is-active{
+    //   background-color: #fff !important;
+    // }
+    // .el-menu-item .is-active {
+    //   background-color: #fff !important;
+    // }
+    // .el-menu-item:hover {
+    //   background-color: #fff !important;
+    // }
+    // /deep/ .el-menu-item {
+    //   background-color: #fff!important;
+    // }
+    
 }
-#navMenuContent {
-  /* height: calc(100% - 20px);
-  width: calc(100% - 20px);
-  float: left;
-  border: 1px solid aqua;
-  box-sizing: border-box;
-  margin: 10px;
-  position: relative; */
-  width: 100% !important;
-  /* background-color: #fff; */
-}
-.switchContent {
-  color: rgb(99, 96, 96);
-  /* background-color: #fff; */
-  /* background-color: #fff; */
-  padding: 2% !important;
-}
-.el-menu-item.is-active {
-  background-color: #fff !important;
-}
-.el-menu-item:hover {
-  background-color: #fff !important;
-}
-.el-form-item__content >>> .el-input .el-input__inner {
-  color: black !important;
-}
-.el-form-item__content >>> i{
-    font-style:normal !important;
-    padding-right: 5px !important;
-}
-.el-form-item, .el-form-item-input{
-  margin:11px 0 11px 0 !important;
-}
-.rowClass  >>> .subTitle {
-  /* height:40px!important; */
-  line-height:51px !important;
-  color:aqua !important;
-  /* margin-top: 11px; */
-}
-.el-col >>> .input-switch  .el-form-item-input{
-  /* display: flex; */
-  margin: initial !important;
-}
-.rowClass >>> .el-col{
-  height: 51px !important;
-}
-.form-switch >>> .el-form-item__label{
-  width: 180px !important;
-}
-.form-switch >>> .el-form-item__content{
-  width: 150px !important;
-  margin-left: 150px !important;
-}
-.input-switch >>> .el-form-item__content{
-  margin-left: initial !important;
-}
-.input-switch-div{
-  position:absolute !important;
-  left:0 !important;
-  top:0 !important;
-  width:1000px !important;
-  display:flex !important;
-}
-.el-col >>> .input-switch-div .el-form-item__content{
-  width: 66px !important
-}
+
 </style>
diff --git a/src/components/index.vue b/src/components/index.vue
index eb7f8de..4822fc8 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -98,6 +98,9 @@
                 v-has="'m11-2'"
                 >站点管理</el-menu-item
               >
+              <el-menu-item index="/ConfigManager/device" v-has="'m11-3'"
+                >设备管理</el-menu-item
+              >
             </el-submenu>
             <el-submenu index="5" v-has="'m4'">
               <template slot="title">
diff --git a/src/components/sys/menu.vue b/src/components/sys/menu.vue
index 7ddc09a..7eae9ae 100644
--- a/src/components/sys/menu.vue
+++ b/src/components/sys/menu.vue
@@ -224,6 +224,16 @@
       DialogTitle: "" //弹窗标题
     };
   },
+  watch: {
+    AddDialog(val) {
+      if(!val) {
+        if(this.$refs['ruleForm']) {
+          this.$refs['ruleForm'].resetFields();
+        }
+        this.resetForm();
+      }
+    }
+  },
   methods: {
     // 获取所有的用户
     loadGridData() {
@@ -257,9 +267,12 @@
     },
     // 点击新增子项
     AddChild(index, rows) {
-      this.$nextTick(function() {
-        this.$refs["ruleForm"].resetFields();
-      });
+      // this.$nextTick(function() {
+      //   this.$refs["ruleForm"].resetFields();
+      // });
+      // setTimeout(() => {
+      //   this.$refs["ruleForm"].resetFields();
+      // }, 0);
       this.AddDialog = true;
 
       this.ruleForm.parentId = rows.menuId;
@@ -349,6 +362,18 @@
       // this.ruleForm.orderNum = rows.orderNum;
 
       this.addAndEditURL = this.nozzle.menuUpdateMenu;
+    },
+    //重置表单
+    resetForm() {
+      this.ruleForm = {
+        parentId: "", //默认为0，新增一级架构时传0
+        menuId: "", //只在修改时起作用
+        // 需要进行操作的四个值
+        name: "",
+        perms: "", //权限标识
+        orderNum: "",
+        type: "" //类型
+      }
     }
   },
   mounted: function() {

diff --git a/src/App.vue b/src/App.vue
index c80ed45..cf24765 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -23,8 +23,4 @@
   color: #2c3e50;
   height: 100%;
 }
-
-.ss {
-  color: ;
-}
 </style>
diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index 53fadc2..7f0ac82 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -68,3 +68,41 @@
 .el-textarea .el-input__count {
   background: transparent;
 }
+/****页面通用样式****/
+.page-data {
+  display: flex;
+  flex-direction: column;
+}
+.page-data .page-filter {
+  text-align: left;
+}
+.page-data .page-content,
+.el-dialog__body .page-content {
+  flex: 1;
+  overflow: hidden;
+}
+.page-data .page-content .page-table {
+  height: 100%;
+}
+.page-data .page-content .page-table .red {
+  color: red;
+}
+.page-data-dialog .el-dialog {
+  display: flex;
+  flex-direction: column;
+  height: 60%;
+  max-height: 60%;
+  margin-top: 10vh !important;
+}
+.page-data-dialog .el-dialog__body {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  padding: 20px;
+  overflow-y: auto;
+}
+.page-data-dialog .el-pagination__sizes,
+.page-data-dialog .el-pagination__total,
+.page-data-dialog .el-pagination__jump {
+  display: none;
+}
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 9fe4611..5d045c0 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -1,15 +1,12 @@
 <template>
   <div id="pagetwo">
     <div class="form">
-      <span class="SelectTitle">站点编号/站点名:</span>
       <el-input
         v-model="searchStr"
         placeholder="请输入站点编号或站点名称"
         clearable
         @change="handleChangeSearch"
       ></el-input>
-      <span class="SelectTitle">时间选择:</span>
-
       <el-date-picker
         v-model="startDate"
         value-format="yyyy-MM-dd"
@@ -43,39 +40,20 @@
     </div>
 
     <el-table :data="listExtend" style="width: 100%; height: calc(100% - 82px)">
-      <el-table-column
-        type="index"
-        label="序号"
-        max-
-        width="70"
-      ></el-table-column>
+      <el-table-column type="index" label="序号" width="70"></el-table-column>
       <el-table-column
         prop="stCode"
         label="站点编号"
-        max-width="130"
+        max-width="120"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
         prop="stName"
         label="站点名称"
         show-overflow-tooltip
-        max-width="200"
-      ></el-table-column>
-      <el-table-column
-        prop="createTime"
-        label="站点安装时间"
-        max-width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="person"
-        label="安装人"
         max-width="150"
       ></el-table-column>
-      <el-table-column
-        prop="tt"
-        label="首次数据接入时间"
-        max-width="180"
-      ></el-table-column>
-      <el-table-column label="站点类型" max-width="150">
+      <el-table-column label="站点类型" width="120">
         <template slot-scope="scope">
           <div>
             <span v-if="scope.row.stationType == 0">水质站</span>
@@ -84,7 +62,36 @@
           </div>
         </template></el-table-column
       >
-      <el-table-column label="操作" max-width="150">
+      <el-table-column
+        prop="createTime"
+        label="站点安装时间"
+        max-width="180"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="person"
+        label="安装人"
+        width="120"
+      ></el-table-column>
+      <el-table-column label="关联设备" width="80">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            size="small"
+            v-if="scope.row.equips.length"
+            @click="handleClick('look', scope.row)"
+            >查看设备</el-button
+          >
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="tt"
+        label="首次数据接入时间"
+        max-width="180"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column label="操作" width="80">
         <template slot-scope="scope">
           <el-button
             type="text"
@@ -129,7 +136,7 @@
               class="selectInput"
               size="small"
               v-model="ruleForm.stationType"
-              placeholder="请选择"
+              placeholder="请选择站点类型"
             >
               <el-option
                 class="selectOption"
@@ -141,6 +148,23 @@
             </el-select>
             <span>按实际设备类型选择站点类型</span>
           </el-form-item>
+          <el-form-item label="所属项目" prop="platformCode">
+            <el-select
+              class="selectInput"
+              size="small"
+              filterable
+              v-model="ruleForm.platformCode"
+              placeholder="请选择所属项目"
+            >
+              <el-option
+                class="selectOption"
+                v-for="item in projectList"
+                :key="item.id"
+                :label="item.key"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="所属区域" prop="area">
             <el-cascader
               ref="cascader"
@@ -149,6 +173,7 @@
               v-model="ruleForm.area"
               :options="syscityList"
               filterable
+              placeholder="请选择所属区域"
               :props="syscityListProps"
               @change="handleChange"
               @visible-change="visiblechange"
@@ -238,7 +263,28 @@
         <el-button type="primary" @click="saveOru('ruleForm')">保存</el-button>
       </span>
     </el-dialog>
-
+    <!--关联设备弹窗-->
+    <page-dialog
+      class="page-data-dialog"
+      :title="dialogInfo.title[dialogInfo.type]"
+      :visible.sync="dialogInfo.visible"
+      :width="dialogInfo.width"
+      :bt-loading="dialogInfo.btLoading"
+      :bt-list="dialogInfo.btList"
+      @handleClick="handleClick"
+    >
+      <page-table
+        tabIndex
+        :api-url="deviceTableInfo.url"
+        :refresh="deviceTableInfo.refresh"
+        :data.sync="deviceTableInfo.data"
+        :query="deviceFilterInfo.query"
+        :init-curpage="deviceTableInfo.initCurpage"
+        :field-list="deviceTableInfo.fieldList"
+        :handle="deviceTableInfo.handle"
+        @handleClick="handleClick"
+      />
+    </page-dialog>
     <el-pagination
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
@@ -328,6 +374,13 @@
             trigger: "change"
           }
         ],
+        platformCode: [
+          {
+            required: true,
+            message: "请选择所属项目",
+            trigger: "change"
+          }
+        ],
         stName: [
           {
             required: true,
@@ -374,13 +427,119 @@
       value: [],
       // 站点管理/所属区域数组
       syscityList: [],
-      syscityListProps: { checkStrictly: true, value: "id", label: "name" }
+      syscityListProps: { checkStrictly: true, value: "id", label: "name" },
+      //当前用户权限内的项目数据
+      projectList: [],
+      //弹窗相关
+      dialogInfo: {
+        title: {
+          look: "关联设备列表"
+        },
+        width: "60%",
+        visible: false,
+        btLoading: false,
+        type: "",
+        btList: [
+          { label: "关闭", type: "", icon: "", event: "close", show: true }
+        ]
+      },
+      //设备搜索相关
+      deviceFilterInfo: {
+        query: {
+          searchStr: "",
+          startDate: "",
+          endDate: ""
+        },
+        list: [
+          {
+            type: "input",
+            label: "设备名称/编号",
+            value: "searchStr",
+            hideLabel: true
+          },
+          {
+            type: "date",
+            label: "开始时间",
+            value: "startDate",
+            dateType: "date",
+            datePickerOptions: "pickerOptionsStart",
+            hideLabel: true
+          },
+          {
+            type: "date",
+            label: "结束时间",
+            value: "endDate",
+            dateType: "date",
+            datePickerOptions: "pickerOptionsEnd",
+            hideLabel: true
+          },
+          {
+            type: "button",
+            label: "查询",
+            btType: "primary",
+            icon: "",
+            event: "search",
+            show: true
+          },
+          {
+            type: "button",
+            label: "添加设备",
+            btType: "primary",
+            icon: "",
+            event: "create",
+            show: true,
+            has: "m11-3-1"
+          }
+        ]
+      },
+      //设备表格相关
+      deviceTableInfo: {
+        url: "", //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [],
+        fieldList: [
+          { label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
+          {
+            label: "设备描述",
+            value: "equipDesc",
+            minWidth: 150,
+            tooltip: true
+          },
+          {
+            label: "设备厂家",
+            value: "equipFactory",
+            minWidth: 150,
+            tooltip: true
+          },
+          { label: "联系人", value: "contactName", width: 100 },
+          { label: "电话", value: "contactMobile", width: 120 }
+        ],
+        handle: {
+          fixed: "right",
+          label: "操作",
+          width: "80",
+          btList: [
+            {
+              label: "解绑",
+              size: "small",
+              type: "text",
+              event: "remove",
+              show: true,
+              has: "m11-3-3"
+            }
+          ]
+        }
+      },
+      //需要进行操作的站点Code
+      needHandleSiteCode: ""
     };
   },
   mounted() {
     this.getsyscityList();
     this.getlistExtend();
     this.getsityType();
+    this.getCurrentUserProject(); //获取当前用户所绑定的项目
   },
   watch: {
     "ruleForm.area": {
@@ -406,6 +565,12 @@
           this.dialogImageUrl = "";
         }
       }
+    },
+    "dialogInfo.visible"(val) {
+      if (!val) {
+        this.deviceTableInfo.data = [];
+        this.dialogInfo.btLoading = false;
+      }
     }
   },
   methods: {
@@ -523,7 +688,6 @@
     },
     // 获取站点列表
     async getlistExtend() {
-      // console.log(this.TimeValue);
       const { data } = await this.$http.post(this.nozzle.listExtend, {
         current: this.currentPage,
         data: {
@@ -554,7 +718,6 @@
             })
             .then(res => {
               this.yzaddflag = false;
-              this.getlistExtend();
             });
         }
       });
@@ -583,19 +746,18 @@
     // 添加站点
     addform(formName) {
       this.yzaddflag = true;
+      // 获取地区列表
       this.title = "新增站点";
     },
     // 操作里面的修改弹窗
     EditFZ(index, rows) {
       // 获取地区列表
-      // console.log(rows);
       for (let key in rows) {
         if (key === "stationType") {
           rows[key] = rows[key].toString();
         }
         this.ruleForm[key] = rows[key];
       }
-      // console.log(this.ruleForm);
       this.yzaddflag = true;
       this.title = "修改站点";
       this.FenZuflag2type = 2;
@@ -616,9 +778,79 @@
           siteType: "site_type"
         }
       });
-
       this.siteTypeList = data.data;
     },
+    //获取当前用户所绑定的项目
+    getCurrentUserProject() {
+      this.$http
+        .post(this.nozzle.sysPlatformList, {
+          current: 0,
+          size: 0,
+          data: { searchStr: "", startDate: "", endDate: "" }
+        })
+        .then(res => {
+          if (res.data.code === 1) {
+            this.projectList = res.data.data.list.map(item => {
+              return {
+                id: item.id,
+                key: item.name,
+                value: item.platformCode
+              };
+            });
+          }
+        });
+    },
+    //点击事件
+    handleClick(event, data, index) {
+      switch (event) {
+        //查看关联设备
+        case "look":
+          this.dialogInfo.visible = true;
+          this.dialogInfo.type = event;
+          this.deviceTableInfo.data = data.equips;
+          this.needHandleSiteCode = data.stCode;
+          break;
+        //解绑设备与站点
+        case "remove":
+          this.$confirm("此操作将解除设备和站点的绑定关系, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+            .then(res => {
+              const params = {
+                data: {
+                  siteCode: this.needHandleSiteCode,
+                  equipNos: [data.equipNo]
+                }
+              };
+              this.$http
+                .post(this.nozzle.sysEquipRemoveBatch, params)
+                .then(res => {
+                  if (res.data.code === 1 || res.data.code === 200) {
+                    this.deviceTableInfo.data.splice(index, 1);
+                    this.getlistExtend();
+                  }
+                  this.$message({
+                    message: res.data.msg,
+                    type: res.data.code === 1 ? "success" : "error",
+                    showClose: true
+                  });
+                })
+                .catch(e => {
+                  message(e);
+                });
+            })
+            .catch(() => {});
+          break;
+        //关闭
+        case "close":
+          setTimeout(() => {
+            this.dialogInfo.visible = false;
+          }, 0);
+          break;
+      }
+    },
     // 关闭弹框后做的操作
     closedialog(formName) {
       this.$refs["ruleForm"].resetFields();
@@ -648,7 +880,7 @@
       };
       this.$refs.cascader.$refs.panel.activePath = [];
       this.$refs.cascader.$refs.panel.clearCheckedNodes();
-      this.getlistExtend();
+      // this.getlistExtend();
     },
     handleChange(value) {
       // 取选中数组的最后一项的id
diff --git a/src/components/ConfigManager/device.vue b/src/components/ConfigManager/device.vue
new file mode 100644
index 0000000..f800811
--- /dev/null
+++ b/src/components/ConfigManager/device.vue
@@ -0,0 +1,297 @@
+<template>
+  <div class="page-data">
+    <!--搜素框-->
+    <div class="page-filter">
+      <page-filter
+        :query.sync="deviceFilterInfo.query"
+        :filter-list="deviceFilterInfo.list"
+        @handleClick="handleClick"
+      />
+    </div>
+    <div class="page-content">
+      <!--表格-->
+      <div class="h-100">
+        <page-table
+          tabIndex
+          pagination
+          :api-url="deviceTableInfo.url"
+          :refresh="deviceTableInfo.refresh"
+          :data.sync="deviceTableInfo.data"
+          :query="deviceFilterInfo.query"
+          :page-query="deviceTableInfo.pageQuery"
+          :list-type-info="listTypeInfo"
+          :init-curpage="deviceTableInfo.initCurpage"
+          :field-list="deviceTableInfo.fieldList"
+          :handle="deviceTableInfo.handle"
+          @handleClick="handleClick"
+        >
+          <template v-slot:col-status="scope">
+            <el-button type="text" size="small" :class="[scope.row.status === 1 ? '' : 'red']">
+              {{ scope.row.status === 1 ? "管理中" : "未管理" }}
+            </el-button>
+          </template>
+        </page-table>
+      </div>
+    </div>
+    <!--弹窗-->
+    <page-dialog
+      :title="dialogInfo.title[dialogInfo.type]"
+      :visible.sync="dialogInfo.visible"
+      :width="dialogInfo.width"
+      :bt-loading="dialogInfo.btLoading"
+      :bt-list="dialogInfo.btList"
+      @handleClick="handleClick"
+    >
+      <page-form
+        :ref-obj.sync="formInfo.ref"
+        :data="formInfo.data"
+        :field-list="formInfo.fieldList"
+        :rules="formInfo.rules"
+        :label-width="formInfo.labelWidth"
+        :list-type-info="listTypeInfo"
+        @handleClick="handleClick"
+      />
+    </page-dialog>
+  </div>
+</template>
+
+<script>
+import { message } from "./../../util/item";
+export default {
+  data() {
+    // 验证电话
+    let checkPhone = (rule, value, callback) => {
+      let check = this.$validate({ label: "电话", value, rules: ["phone"] });
+      if (!check.result) {
+        callback(new Error(check.message));
+      } else {
+        callback();
+      }
+    };
+    return {
+      //设备搜索相关
+      deviceFilterInfo: {
+        query: {
+          searchStr: "",
+          startDate: "",
+          endDate: ""
+        },
+        list: [
+          {type: "input", label: "设备名称/编号", value: "searchStr", hideLabel: true },
+          {type: "date", label: "开始时间", value: "startDate", dateType: "date", datePickerOptions: "pickerOptionsStart", hideLabel: true},
+          {type: "date", label: "结束时间", value: "endDate", dateType: "date", datePickerOptions: "pickerOptionsEnd", hideLabel: true},
+          {type: "button", label: "查询", btType: "primary", icon: "", event: "search", show: true},
+          {type: "button", label: "添加设备", btType: "primary", icon: "", event: "create", show: true, has: "m11-3-1"}
+        ]
+      },
+      //设备表格相关
+      deviceTableInfo: {
+        url: this.nozzle.sysEquipList, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [
+          {equipNo:1000,equipDesc:"3333",equipFactory:'4444'}
+        ],
+        fieldList: [
+          { label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
+          { label: "设备描述", value: "equipDesc", minWidth: 150, tooltip: true },
+          { label: "设备厂家", value: "equipFactory", minWidth: 150, tooltip: true },
+          { label: "厂家简称", value: "equipFactoryAbb", minWidth: 100, tooltip: true },
+          { label: "联系人", value: "contactName", width: 100 },
+          { label: "电话", value: "contactMobile", width: 120 },
+          { label: "站点编号", value: "siteCode", minWidth: 100, tooltip: true },
+          { label: "更新时间", value: "updateTime", minWidth: 150, tooltip: true }
+        ],
+        handle: {
+          fixed: "right",
+          label: "操作",
+          width: "120",
+          btList: [
+            { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-3-2' },
+            { label: "删除", size: "small", type: "text", event: "delete", show: true, has: 'm11-3-3' }
+          ]
+        }
+      },
+      //设备表单相关
+      formInfo: {
+        ref: null,
+        data: {
+          id: undefined,
+          equipNo: "",
+          equipDesc: "",
+          equipFactory: "",
+          equipFactoryAbb: "",
+          contactName: "",
+          contactMobile: "",
+          siteCode: ""
+        },
+        fieldList: [
+          { label: "设备编号", value: "equipNo", type: "input", required: true },
+          { label: "设备描述", value: "equipDesc", type: "input", required: true },
+          { label: "设备厂家", value: "equipFactory", type: "input", required: true },
+          { label: "厂家简称", value: "equipFactoryAbb", type: "input", required: true },
+          { label: "联系人", value: "contactName", type: "input", required: true },
+          { label: "电话", value: "contactMobile", type: "input", required: true, validator: checkPhone },
+          { label: "站点编号", value: "siteCode", type: "select", list: "siteList", filterable:true, required: true },
+        ],
+        rules: {},
+      },
+      //列表相关
+      listTypeInfo:{
+        siteList:[]
+      },
+      //弹窗相关
+      dialogInfo:{
+        title: {
+          update: '编辑设备',
+          create: '添加设备'
+        },
+        width: '500px',
+        visible: false,
+        btLoading: false,
+        type: '',
+        btList: [
+          {label:'关闭',type:'',icon:'',event:'close',show:true},
+          {label:'保存',type:'primary',icon:'',event:'save',show:true,loading:true}
+        ]
+      },
+    }
+  },
+  watch: {
+    "dialogInfo.visible"(val) {
+      if (!val) {
+        if (this.formInfo.ref) {
+          this.formInfo.ref.resetFields();
+        }
+        this.resetForm();
+        this.btnLoading = false;
+      }
+    },
+  },
+  created() {
+    this.initSiteData();
+  },
+  mounted() {
+    this.initRules();
+    this.deviceTableInfo.refresh = Math.random();
+  },
+  methods: {
+    //初始化验证
+    initRules() {
+      const formInfo = this.formInfo;
+      formInfo.rules = this.$initRules(formInfo.fieldList);
+    },
+    //初始化站点数据
+    initSiteData() {
+      this.$http.post(this.nozzle.listExtend, {
+        current: 0,
+        data: {searchStr: "",startDate: "",endDate: ""},
+        size: 0
+      }).then(res =>{
+        if(res.data.code === 1) {
+          this.listTypeInfo.siteList = res.data.data.list.map(item =>{
+            return {
+              key: item.stName,
+              value: item.stCode
+            }
+          })
+        }
+      })
+    },
+    //点击事件
+    handleClick(event, data) {
+      switch (event) {
+        //设备搜索
+        case "search":
+          this.deviceTableInfo.initCurpage = Math.random();
+          this.deviceTableInfo.refresh = Math.random();
+          break;
+        //设备添加按钮
+        case "create":
+          this.dialogInfo.type = event;
+          this.dialogInfo.visible = true;
+          break;
+        //编辑设备按钮
+        case "update":
+          this.dialogInfo.type = event;
+          this.dialogInfo.visible = true;
+          for (let key in data) {
+            if (key in this.formInfo.data) {
+              this.formInfo.data[key] = data[key];
+            }
+          }
+          break;
+        //删除设备按钮
+        case "delete":
+          this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(res =>{
+            this.$http.post(this.nozzle.sysEquipDelete,{data:{equipNo:data.equipNo}}).then(res =>{
+              if(res.data.code === 1 || res.data.code === 200) {
+                this.deviceTableInfo.refresh = Math.random();
+                this.deviceTableInfo.initCurpage = Math.random();
+              }
+              this.$message({
+                message: res.data.msg,
+                type: res.data.code === 1 ? 'success' : 'error',
+                showClose: true,
+              })
+            }).catch(e =>{
+              message(e);
+            })
+          }).catch(() =>{})
+          break;
+        //关闭
+        case "close":
+          setTimeout(() => {
+            this.dialogInfo.visible = false;
+          }, 0);
+          break;
+        //保存表单
+        case "save":
+          const type = this.dialogInfo.type;
+          this.formInfo.ref.validate(valid => {
+            if (valid) {
+              this.btnLoading = true;
+              const params = {
+                data: this.formInfo.data
+              }
+              this.$http.post(this.nozzle.sysEquipAddUpdate, params).then(res => {
+                if (res.data.code === 1 || res.data.code === 200) {
+                  this.dialogInfo.visible = false;
+                  this.deviceTableInfo.refresh = Math.random();
+                }
+                this.$message({
+                  message: res.data.msg,
+                  type: res.data.code === 1 ? "success" : "error",
+                  showClose: true
+                });
+                this.btnLoading = false;
+              })
+              .catch(e => {
+                console.log(e);
+                this.btnLoading = false;
+              });
+            }
+          });
+          break;
+      }
+    },
+    //重置表单
+    resetForm() {
+      this.formInfo.data = {
+        id: undefined,
+        equipNo: "",
+        equipDesc: "",
+        equipFactory: "",
+        equipFactoryAbb: "",
+        contactName: "",
+        contactMobile: "",
+        siteCode: ""
+      }
+    },
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index da934e0..065f3da 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -989,22 +989,6 @@
 </script>
 
 <style lang="scss" scoped>
-.page-data {
-  @include fd();
-}
-.page-filter {
-  text-align: left;
-}
-.page-content {
-  flex: 1;
-  overflow: hidden;
-  .page-table {
-    height: 100%;
-  }
-  .red {
-    color: red;
-  }
-}
 .btn-group {
   height: 100%;
   @include fdaj(center, center);
diff --git a/src/components/common/PageTable/index.vue b/src/components/common/PageTable/index.vue
index aade3fc..0536b03 100644
--- a/src/components/common/PageTable/index.vue
+++ b/src/components/common/PageTable/index.vue
@@ -87,7 +87,7 @@
               v-has="item.has ? item.has : ''"
               :disabled="item.disabled"
               :loading="scope.row[item.loading]"
-              @click="handleClick(item.event, scope.row)"
+              @click="handleClick(item.event, scope.row, scope.$index)"
             >
               {{ item.label }}
             </el-button>
@@ -102,7 +102,7 @@
         layout="total, sizes, prev, pager, next, jumper"
         :total="listInfo.total"
         :pager-count="5"
-        :page-sizes="[20, 50, 100, 500, 1000]"
+        :page-sizes="[10, 50, 100, 500, 1000]"
         :page-size="listInfo.query.size"
         :current-page.sync="listInfo.query.current"
         @current-change="handleCurrentChange"
@@ -207,7 +207,7 @@
         loading:false,  //加载动画
         query:{ //查询条件
           current:1,  //当前页
-          size:20,  //每页条数
+          size:10,  //每页条数
         }
       },
     }
@@ -250,8 +250,8 @@
       this.$emit('handleEvent', this.type, rows);
     },
     //派发按钮点击事件
-    handleClick(event, data){
-      this.$emit('handleClick', event, data);
+    handleClick(event, data, index){
+      this.$emit('handleClick', event, data, index);
     },
     /**
       * 通过key找到在列表中对应的显示
diff --git a/src/components/configure/RtuConfig.vue b/src/components/configure/RtuConfig.vue
index c323511..41964ed 100644
--- a/src/components/configure/RtuConfig.vue
+++ b/src/components/configure/RtuConfig.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="content">
+  <div class="content">
     <div
       v-if="formAll && formAllBody && formAllBody.length"
       style="text-align:left;padding:10px"
@@ -865,75 +865,105 @@
   // }
 };
 </script>
-<style scoped>
-#content{
+<style lang="scss" scoped>
+.content{
     width: 100% !important;
     height: 100% !important;
+    #navMenuContent {
+      /* height: calc(100% - 20px);
+      width: calc(100% - 20px);
+      float: left;
+      border: 1px solid aqua;
+      box-sizing: border-box;
+      margin: 10px;
+      position: relative; */
+      width: 100%;
+      /* background-color: #fff; */
+    }
+    /deep/ .switchContent {
+      // color: rgb(99, 96, 96);
+      color: red;
+      /* background-color: #fff; */
+      /* background-color: #fff; */
+      // color: white !important;
+      
+      padding: 2%;
+      .el-form-item__content .el-input .el-input__inner {
+        color: var(--white);
+      }
+      .el-form-item .el-form-item__label{
+        color: var(--white);
+      }
+      .el-form-item__content i{
+          font-style:normal !important;
+          padding-right: 5px !important;
+      }
+      .el-form-item, .el-form-item-input{
+        margin:11px 0 11px 0 !important;
+      }
+      .rowClass .subTitle {
+        /* height:40px!important; */
+        line-height:51px !important;
+        color:aqua !important;
+        /* margin-top: 11px; */
+      }
+      .el-col .input-switch .el-form-item-input{
+        /* display: flex; */
+        margin: initial !important;
+      }
+      .rowClass .el-col{
+        height: 51px !important;
+      }
+      .form-switch .el-form-item__label{
+        width: 180px !important;
+      }
+     .form-switch .el-form-item__content{
+        width: 150px !important;
+        margin-left: 150px !important;
+      }
+      .input-switch .el-form-item__content{
+        margin-left: 0 !important;
+      }
+      .input-switch-div{
+        position:absolute !important;
+        left:0 !important;
+        top:0 !important;
+        width:1000px !important;
+        display:flex !important;
+      }
+      .el-col .input-switch-div .el-form-item__content{
+        width: 66px !important
+      }
+    }
+    // /deep/.el-menu-item{
+    //   background-color: #fff !important;
+    // }
+    /deep/ .el-menu{
+      // background-color: var(--dialogtitle)!important;
+      .el-menu-item{
+        background-color: #fff !important;
+      }
+      .el-menu-item.is-active {
+        // background-color: var(--dialogtitle)!important;
+        // background-color: #fff !important;
+      }
+      .el-menu-item:hover {
+        background-color: #fff !important;
+      }
+    } 
+    // .el-menu--horizontal>.el-menu-item.is-active{
+    //   background-color: #fff !important;
+    // }
+    // .el-menu-item .is-active {
+    //   background-color: #fff !important;
+    // }
+    // .el-menu-item:hover {
+    //   background-color: #fff !important;
+    // }
+    // /deep/ .el-menu-item {
+    //   background-color: #fff!important;
+    // }
+    
 }
-#navMenuContent {
-  /* height: calc(100% - 20px);
-  width: calc(100% - 20px);
-  float: left;
-  border: 1px solid aqua;
-  box-sizing: border-box;
-  margin: 10px;
-  position: relative; */
-  width: 100% !important;
-  /* background-color: #fff; */
-}
-.switchContent {
-  color: rgb(99, 96, 96);
-  /* background-color: #fff; */
-  /* background-color: #fff; */
-  padding: 2% !important;
-}
-.el-menu-item.is-active {
-  background-color: #fff !important;
-}
-.el-menu-item:hover {
-  background-color: #fff !important;
-}
-.el-form-item__content >>> .el-input .el-input__inner {
-  color: black !important;
-}
-.el-form-item__content >>> i{
-    font-style:normal !important;
-    padding-right: 5px !important;
-}
-.el-form-item, .el-form-item-input{
-  margin:11px 0 11px 0 !important;
-}
-.rowClass  >>> .subTitle {
-  /* height:40px!important; */
-  line-height:51px !important;
-  color:aqua !important;
-  /* margin-top: 11px; */
-}
-.el-col >>> .input-switch  .el-form-item-input{
-  /* display: flex; */
-  margin: initial !important;
-}
-.rowClass >>> .el-col{
-  height: 51px !important;
-}
-.form-switch >>> .el-form-item__label{
-  width: 180px !important;
-}
-.form-switch >>> .el-form-item__content{
-  width: 150px !important;
-  margin-left: 150px !important;
-}
-.input-switch >>> .el-form-item__content{
-  margin-left: initial !important;
-}
-.input-switch-div{
-  position:absolute !important;
-  left:0 !important;
-  top:0 !important;
-  width:1000px !important;
-  display:flex !important;
-}
-.el-col >>> .input-switch-div .el-form-item__content{
-  width: 66px !important
-}
+
 </style>
diff --git a/src/components/index.vue b/src/components/index.vue
index eb7f8de..4822fc8 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -98,6 +98,9 @@
                 v-has="'m11-2'"
                 >站点管理</el-menu-item
               >
+              <el-menu-item index="/ConfigManager/device" v-has="'m11-3'"
+                >设备管理</el-menu-item
+              >
             </el-submenu>
             <el-submenu index="5" v-has="'m4'">
               <template slot="title">
diff --git a/src/components/sys/menu.vue b/src/components/sys/menu.vue
index 7ddc09a..7eae9ae 100644
--- a/src/components/sys/menu.vue
+++ b/src/components/sys/menu.vue
@@ -224,6 +224,16 @@
       DialogTitle: "" //弹窗标题
     };
   },
+  watch: {
+    AddDialog(val) {
+      if(!val) {
+        if(this.$refs['ruleForm']) {
+          this.$refs['ruleForm'].resetFields();
+        }
+        this.resetForm();
+      }
+    }
+  },
   methods: {
     // 获取所有的用户
     loadGridData() {
@@ -257,9 +267,12 @@
     },
     // 点击新增子项
     AddChild(index, rows) {
-      this.$nextTick(function() {
-        this.$refs["ruleForm"].resetFields();
-      });
+      // this.$nextTick(function() {
+      //   this.$refs["ruleForm"].resetFields();
+      // });
+      // setTimeout(() => {
+      //   this.$refs["ruleForm"].resetFields();
+      // }, 0);
       this.AddDialog = true;
 
       this.ruleForm.parentId = rows.menuId;
@@ -349,6 +362,18 @@
       // this.ruleForm.orderNum = rows.orderNum;
 
       this.addAndEditURL = this.nozzle.menuUpdateMenu;
+    },
+    //重置表单
+    resetForm() {
+      this.ruleForm = {
+        parentId: "", //默认为0，新增一级架构时传0
+        menuId: "", //只在修改时起作用
+        // 需要进行操作的四个值
+        name: "",
+        perms: "", //权限标识
+        orderNum: "",
+        type: "" //类型
+      }
     }
   },
   mounted: function() {
diff --git a/src/element/index.js b/src/element/index.js
index 781e688..160da1f 100644
--- a/src/element/index.js
+++ b/src/element/index.js
@@ -119,7 +119,7 @@
 Vue.use(Row)
 Vue.use(Col)
 Vue.use(Upload)
-// Vue.use(Progress)
+Vue.use(Progress)
 // Vue.use(Badge)
 Vue.use(Card)
 // Vue.use(Rate)

diff --git a/src/App.vue b/src/App.vue
index c80ed45..cf24765 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -23,8 +23,4 @@
   color: #2c3e50;
   height: 100%;
 }
-
-.ss {
-  color: ;
-}
 </style>
diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index 53fadc2..7f0ac82 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -68,3 +68,41 @@
 .el-textarea .el-input__count {
   background: transparent;
 }
+/****页面通用样式****/
+.page-data {
+  display: flex;
+  flex-direction: column;
+}
+.page-data .page-filter {
+  text-align: left;
+}
+.page-data .page-content,
+.el-dialog__body .page-content {
+  flex: 1;
+  overflow: hidden;
+}
+.page-data .page-content .page-table {
+  height: 100%;
+}
+.page-data .page-content .page-table .red {
+  color: red;
+}
+.page-data-dialog .el-dialog {
+  display: flex;
+  flex-direction: column;
+  height: 60%;
+  max-height: 60%;
+  margin-top: 10vh !important;
+}
+.page-data-dialog .el-dialog__body {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  padding: 20px;
+  overflow-y: auto;
+}
+.page-data-dialog .el-pagination__sizes,
+.page-data-dialog .el-pagination__total,
+.page-data-dialog .el-pagination__jump {
+  display: none;
+}
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 9fe4611..5d045c0 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -1,15 +1,12 @@
 <template>
   <div id="pagetwo">
     <div class="form">
-      <span class="SelectTitle">站点编号/站点名:</span>
       <el-input
         v-model="searchStr"
         placeholder="请输入站点编号或站点名称"
         clearable
         @change="handleChangeSearch"
       ></el-input>
-      <span class="SelectTitle">时间选择:</span>
-
       <el-date-picker
         v-model="startDate"
         value-format="yyyy-MM-dd"
@@ -43,39 +40,20 @@
     </div>
 
     <el-table :data="listExtend" style="width: 100%; height: calc(100% - 82px)">
-      <el-table-column
-        type="index"
-        label="序号"
-        max-
-        width="70"
-      ></el-table-column>
+      <el-table-column type="index" label="序号" width="70"></el-table-column>
       <el-table-column
         prop="stCode"
         label="站点编号"
-        max-width="130"
+        max-width="120"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
         prop="stName"
         label="站点名称"
         show-overflow-tooltip
-        max-width="200"
-      ></el-table-column>
-      <el-table-column
-        prop="createTime"
-        label="站点安装时间"
-        max-width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="person"
-        label="安装人"
         max-width="150"
       ></el-table-column>
-      <el-table-column
-        prop="tt"
-        label="首次数据接入时间"
-        max-width="180"
-      ></el-table-column>
-      <el-table-column label="站点类型" max-width="150">
+      <el-table-column label="站点类型" width="120">
         <template slot-scope="scope">
           <div>
             <span v-if="scope.row.stationType == 0">水质站</span>
@@ -84,7 +62,36 @@
           </div>
         </template></el-table-column
       >
-      <el-table-column label="操作" max-width="150">
+      <el-table-column
+        prop="createTime"
+        label="站点安装时间"
+        max-width="180"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="person"
+        label="安装人"
+        width="120"
+      ></el-table-column>
+      <el-table-column label="关联设备" width="80">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            size="small"
+            v-if="scope.row.equips.length"
+            @click="handleClick('look', scope.row)"
+            >查看设备</el-button
+          >
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="tt"
+        label="首次数据接入时间"
+        max-width="180"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column label="操作" width="80">
         <template slot-scope="scope">
           <el-button
             type="text"
@@ -129,7 +136,7 @@
               class="selectInput"
               size="small"
               v-model="ruleForm.stationType"
-              placeholder="请选择"
+              placeholder="请选择站点类型"
             >
               <el-option
                 class="selectOption"
@@ -141,6 +148,23 @@
             </el-select>
             <span>按实际设备类型选择站点类型</span>
           </el-form-item>
+          <el-form-item label="所属项目" prop="platformCode">
+            <el-select
+              class="selectInput"
+              size="small"
+              filterable
+              v-model="ruleForm.platformCode"
+              placeholder="请选择所属项目"
+            >
+              <el-option
+                class="selectOption"
+                v-for="item in projectList"
+                :key="item.id"
+                :label="item.key"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="所属区域" prop="area">
             <el-cascader
               ref="cascader"
@@ -149,6 +173,7 @@
               v-model="ruleForm.area"
               :options="syscityList"
               filterable
+              placeholder="请选择所属区域"
               :props="syscityListProps"
               @change="handleChange"
               @visible-change="visiblechange"
@@ -238,7 +263,28 @@
         <el-button type="primary" @click="saveOru('ruleForm')">保存</el-button>
       </span>
     </el-dialog>
-
+    <!--关联设备弹窗-->
+    <page-dialog
+      class="page-data-dialog"
+      :title="dialogInfo.title[dialogInfo.type]"
+      :visible.sync="dialogInfo.visible"
+      :width="dialogInfo.width"
+      :bt-loading="dialogInfo.btLoading"
+      :bt-list="dialogInfo.btList"
+      @handleClick="handleClick"
+    >
+      <page-table
+        tabIndex
+        :api-url="deviceTableInfo.url"
+        :refresh="deviceTableInfo.refresh"
+        :data.sync="deviceTableInfo.data"
+        :query="deviceFilterInfo.query"
+        :init-curpage="deviceTableInfo.initCurpage"
+        :field-list="deviceTableInfo.fieldList"
+        :handle="deviceTableInfo.handle"
+        @handleClick="handleClick"
+      />
+    </page-dialog>
     <el-pagination
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
@@ -328,6 +374,13 @@
             trigger: "change"
           }
         ],
+        platformCode: [
+          {
+            required: true,
+            message: "请选择所属项目",
+            trigger: "change"
+          }
+        ],
         stName: [
           {
             required: true,
@@ -374,13 +427,119 @@
       value: [],
       // 站点管理/所属区域数组
       syscityList: [],
-      syscityListProps: { checkStrictly: true, value: "id", label: "name" }
+      syscityListProps: { checkStrictly: true, value: "id", label: "name" },
+      //当前用户权限内的项目数据
+      projectList: [],
+      //弹窗相关
+      dialogInfo: {
+        title: {
+          look: "关联设备列表"
+        },
+        width: "60%",
+        visible: false,
+        btLoading: false,
+        type: "",
+        btList: [
+          { label: "关闭", type: "", icon: "", event: "close", show: true }
+        ]
+      },
+      //设备搜索相关
+      deviceFilterInfo: {
+        query: {
+          searchStr: "",
+          startDate: "",
+          endDate: ""
+        },
+        list: [
+          {
+            type: "input",
+            label: "设备名称/编号",
+            value: "searchStr",
+            hideLabel: true
+          },
+          {
+            type: "date",
+            label: "开始时间",
+            value: "startDate",
+            dateType: "date",
+            datePickerOptions: "pickerOptionsStart",
+            hideLabel: true
+          },
+          {
+            type: "date",
+            label: "结束时间",
+            value: "endDate",
+            dateType: "date",
+            datePickerOptions: "pickerOptionsEnd",
+            hideLabel: true
+          },
+          {
+            type: "button",
+            label: "查询",
+            btType: "primary",
+            icon: "",
+            event: "search",
+            show: true
+          },
+          {
+            type: "button",
+            label: "添加设备",
+            btType: "primary",
+            icon: "",
+            event: "create",
+            show: true,
+            has: "m11-3-1"
+          }
+        ]
+      },
+      //设备表格相关
+      deviceTableInfo: {
+        url: "", //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [],
+        fieldList: [
+          { label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
+          {
+            label: "设备描述",
+            value: "equipDesc",
+            minWidth: 150,
+            tooltip: true
+          },
+          {
+            label: "设备厂家",
+            value: "equipFactory",
+            minWidth: 150,
+            tooltip: true
+          },
+          { label: "联系人", value: "contactName", width: 100 },
+          { label: "电话", value: "contactMobile", width: 120 }
+        ],
+        handle: {
+          fixed: "right",
+          label: "操作",
+          width: "80",
+          btList: [
+            {
+              label: "解绑",
+              size: "small",
+              type: "text",
+              event: "remove",
+              show: true,
+              has: "m11-3-3"
+            }
+          ]
+        }
+      },
+      //需要进行操作的站点Code
+      needHandleSiteCode: ""
     };
   },
   mounted() {
     this.getsyscityList();
     this.getlistExtend();
     this.getsityType();
+    this.getCurrentUserProject(); //获取当前用户所绑定的项目
   },
   watch: {
     "ruleForm.area": {
@@ -406,6 +565,12 @@
           this.dialogImageUrl = "";
         }
       }
+    },
+    "dialogInfo.visible"(val) {
+      if (!val) {
+        this.deviceTableInfo.data = [];
+        this.dialogInfo.btLoading = false;
+      }
     }
   },
   methods: {
@@ -523,7 +688,6 @@
     },
     // 获取站点列表
     async getlistExtend() {
-      // console.log(this.TimeValue);
       const { data } = await this.$http.post(this.nozzle.listExtend, {
         current: this.currentPage,
         data: {
@@ -554,7 +718,6 @@
             })
             .then(res => {
               this.yzaddflag = false;
-              this.getlistExtend();
             });
         }
       });
@@ -583,19 +746,18 @@
     // 添加站点
     addform(formName) {
       this.yzaddflag = true;
+      // 获取地区列表
       this.title = "新增站点";
     },
     // 操作里面的修改弹窗
     EditFZ(index, rows) {
       // 获取地区列表
-      // console.log(rows);
       for (let key in rows) {
         if (key === "stationType") {
           rows[key] = rows[key].toString();
         }
         this.ruleForm[key] = rows[key];
       }
-      // console.log(this.ruleForm);
       this.yzaddflag = true;
       this.title = "修改站点";
       this.FenZuflag2type = 2;
@@ -616,9 +778,79 @@
           siteType: "site_type"
         }
       });
-
       this.siteTypeList = data.data;
     },
+    //获取当前用户所绑定的项目
+    getCurrentUserProject() {
+      this.$http
+        .post(this.nozzle.sysPlatformList, {
+          current: 0,
+          size: 0,
+          data: { searchStr: "", startDate: "", endDate: "" }
+        })
+        .then(res => {
+          if (res.data.code === 1) {
+            this.projectList = res.data.data.list.map(item => {
+              return {
+                id: item.id,
+                key: item.name,
+                value: item.platformCode
+              };
+            });
+          }
+        });
+    },
+    //点击事件
+    handleClick(event, data, index) {
+      switch (event) {
+        //查看关联设备
+        case "look":
+          this.dialogInfo.visible = true;
+          this.dialogInfo.type = event;
+          this.deviceTableInfo.data = data.equips;
+          this.needHandleSiteCode = data.stCode;
+          break;
+        //解绑设备与站点
+        case "remove":
+          this.$confirm("此操作将解除设备和站点的绑定关系, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+            .then(res => {
+              const params = {
+                data: {
+                  siteCode: this.needHandleSiteCode,
+                  equipNos: [data.equipNo]
+                }
+              };
+              this.$http
+                .post(this.nozzle.sysEquipRemoveBatch, params)
+                .then(res => {
+                  if (res.data.code === 1 || res.data.code === 200) {
+                    this.deviceTableInfo.data.splice(index, 1);
+                    this.getlistExtend();
+                  }
+                  this.$message({
+                    message: res.data.msg,
+                    type: res.data.code === 1 ? "success" : "error",
+                    showClose: true
+                  });
+                })
+                .catch(e => {
+                  message(e);
+                });
+            })
+            .catch(() => {});
+          break;
+        //关闭
+        case "close":
+          setTimeout(() => {
+            this.dialogInfo.visible = false;
+          }, 0);
+          break;
+      }
+    },
     // 关闭弹框后做的操作
     closedialog(formName) {
       this.$refs["ruleForm"].resetFields();
@@ -648,7 +880,7 @@
       };
       this.$refs.cascader.$refs.panel.activePath = [];
       this.$refs.cascader.$refs.panel.clearCheckedNodes();
-      this.getlistExtend();
+      // this.getlistExtend();
     },
     handleChange(value) {
       // 取选中数组的最后一项的id
diff --git a/src/components/ConfigManager/device.vue b/src/components/ConfigManager/device.vue
new file mode 100644
index 0000000..f800811
--- /dev/null
+++ b/src/components/ConfigManager/device.vue
@@ -0,0 +1,297 @@
+<template>
+  <div class="page-data">
+    <!--搜素框-->
+    <div class="page-filter">
+      <page-filter
+        :query.sync="deviceFilterInfo.query"
+        :filter-list="deviceFilterInfo.list"
+        @handleClick="handleClick"
+      />
+    </div>
+    <div class="page-content">
+      <!--表格-->
+      <div class="h-100">
+        <page-table
+          tabIndex
+          pagination
+          :api-url="deviceTableInfo.url"
+          :refresh="deviceTableInfo.refresh"
+          :data.sync="deviceTableInfo.data"
+          :query="deviceFilterInfo.query"
+          :page-query="deviceTableInfo.pageQuery"
+          :list-type-info="listTypeInfo"
+          :init-curpage="deviceTableInfo.initCurpage"
+          :field-list="deviceTableInfo.fieldList"
+          :handle="deviceTableInfo.handle"
+          @handleClick="handleClick"
+        >
+          <template v-slot:col-status="scope">
+            <el-button type="text" size="small" :class="[scope.row.status === 1 ? '' : 'red']">
+              {{ scope.row.status === 1 ? "管理中" : "未管理" }}
+            </el-button>
+          </template>
+        </page-table>
+      </div>
+    </div>
+    <!--弹窗-->
+    <page-dialog
+      :title="dialogInfo.title[dialogInfo.type]"
+      :visible.sync="dialogInfo.visible"
+      :width="dialogInfo.width"
+      :bt-loading="dialogInfo.btLoading"
+      :bt-list="dialogInfo.btList"
+      @handleClick="handleClick"
+    >
+      <page-form
+        :ref-obj.sync="formInfo.ref"
+        :data="formInfo.data"
+        :field-list="formInfo.fieldList"
+        :rules="formInfo.rules"
+        :label-width="formInfo.labelWidth"
+        :list-type-info="listTypeInfo"
+        @handleClick="handleClick"
+      />
+    </page-dialog>
+  </div>
+</template>
+
+<script>
+import { message } from "./../../util/item";
+export default {
+  data() {
+    // 验证电话
+    let checkPhone = (rule, value, callback) => {
+      let check = this.$validate({ label: "电话", value, rules: ["phone"] });
+      if (!check.result) {
+        callback(new Error(check.message));
+      } else {
+        callback();
+      }
+    };
+    return {
+      //设备搜索相关
+      deviceFilterInfo: {
+        query: {
+          searchStr: "",
+          startDate: "",
+          endDate: ""
+        },
+        list: [
+          {type: "input", label: "设备名称/编号", value: "searchStr", hideLabel: true },
+          {type: "date", label: "开始时间", value: "startDate", dateType: "date", datePickerOptions: "pickerOptionsStart", hideLabel: true},
+          {type: "date", label: "结束时间", value: "endDate", dateType: "date", datePickerOptions: "pickerOptionsEnd", hideLabel: true},
+          {type: "button", label: "查询", btType: "primary", icon: "", event: "search", show: true},
+          {type: "button", label: "添加设备", btType: "primary", icon: "", event: "create", show: true, has: "m11-3-1"}
+        ]
+      },
+      //设备表格相关
+      deviceTableInfo: {
+        url: this.nozzle.sysEquipList, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [
+          {equipNo:1000,equipDesc:"3333",equipFactory:'4444'}
+        ],
+        fieldList: [
+          { label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
+          { label: "设备描述", value: "equipDesc", minWidth: 150, tooltip: true },
+          { label: "设备厂家", value: "equipFactory", minWidth: 150, tooltip: true },
+          { label: "厂家简称", value: "equipFactoryAbb", minWidth: 100, tooltip: true },
+          { label: "联系人", value: "contactName", width: 100 },
+          { label: "电话", value: "contactMobile", width: 120 },
+          { label: "站点编号", value: "siteCode", minWidth: 100, tooltip: true },
+          { label: "更新时间", value: "updateTime", minWidth: 150, tooltip: true }
+        ],
+        handle: {
+          fixed: "right",
+          label: "操作",
+          width: "120",
+          btList: [
+            { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-3-2' },
+            { label: "删除", size: "small", type: "text", event: "delete", show: true, has: 'm11-3-3' }
+          ]
+        }
+      },
+      //设备表单相关
+      formInfo: {
+        ref: null,
+        data: {
+          id: undefined,
+          equipNo: "",
+          equipDesc: "",
+          equipFactory: "",
+          equipFactoryAbb: "",
+          contactName: "",
+          contactMobile: "",
+          siteCode: ""
+        },
+        fieldList: [
+          { label: "设备编号", value: "equipNo", type: "input", required: true },
+          { label: "设备描述", value: "equipDesc", type: "input", required: true },
+          { label: "设备厂家", value: "equipFactory", type: "input", required: true },
+          { label: "厂家简称", value: "equipFactoryAbb", type: "input", required: true },
+          { label: "联系人", value: "contactName", type: "input", required: true },
+          { label: "电话", value: "contactMobile", type: "input", required: true, validator: checkPhone },
+          { label: "站点编号", value: "siteCode", type: "select", list: "siteList", filterable:true, required: true },
+        ],
+        rules: {},
+      },
+      //列表相关
+      listTypeInfo:{
+        siteList:[]
+      },
+      //弹窗相关
+      dialogInfo:{
+        title: {
+          update: '编辑设备',
+          create: '添加设备'
+        },
+        width: '500px',
+        visible: false,
+        btLoading: false,
+        type: '',
+        btList: [
+          {label:'关闭',type:'',icon:'',event:'close',show:true},
+          {label:'保存',type:'primary',icon:'',event:'save',show:true,loading:true}
+        ]
+      },
+    }
+  },
+  watch: {
+    "dialogInfo.visible"(val) {
+      if (!val) {
+        if (this.formInfo.ref) {
+          this.formInfo.ref.resetFields();
+        }
+        this.resetForm();
+        this.btnLoading = false;
+      }
+    },
+  },
+  created() {
+    this.initSiteData();
+  },
+  mounted() {
+    this.initRules();
+    this.deviceTableInfo.refresh = Math.random();
+  },
+  methods: {
+    //初始化验证
+    initRules() {
+      const formInfo = this.formInfo;
+      formInfo.rules = this.$initRules(formInfo.fieldList);
+    },
+    //初始化站点数据
+    initSiteData() {
+      this.$http.post(this.nozzle.listExtend, {
+        current: 0,
+        data: {searchStr: "",startDate: "",endDate: ""},
+        size: 0
+      }).then(res =>{
+        if(res.data.code === 1) {
+          this.listTypeInfo.siteList = res.data.data.list.map(item =>{
+            return {
+              key: item.stName,
+              value: item.stCode
+            }
+          })
+        }
+      })
+    },
+    //点击事件
+    handleClick(event, data) {
+      switch (event) {
+        //设备搜索
+        case "search":
+          this.deviceTableInfo.initCurpage = Math.random();
+          this.deviceTableInfo.refresh = Math.random();
+          break;
+        //设备添加按钮
+        case "create":
+          this.dialogInfo.type = event;
+          this.dialogInfo.visible = true;
+          break;
+        //编辑设备按钮
+        case "update":
+          this.dialogInfo.type = event;
+          this.dialogInfo.visible = true;
+          for (let key in data) {
+            if (key in this.formInfo.data) {
+              this.formInfo.data[key] = data[key];
+            }
+          }
+          break;
+        //删除设备按钮
+        case "delete":
+          this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(res =>{
+            this.$http.post(this.nozzle.sysEquipDelete,{data:{equipNo:data.equipNo}}).then(res =>{
+              if(res.data.code === 1 || res.data.code === 200) {
+                this.deviceTableInfo.refresh = Math.random();
+                this.deviceTableInfo.initCurpage = Math.random();
+              }
+              this.$message({
+                message: res.data.msg,
+                type: res.data.code === 1 ? 'success' : 'error',
+                showClose: true,
+              })
+            }).catch(e =>{
+              message(e);
+            })
+          }).catch(() =>{})
+          break;
+        //关闭
+        case "close":
+          setTimeout(() => {
+            this.dialogInfo.visible = false;
+          }, 0);
+          break;
+        //保存表单
+        case "save":
+          const type = this.dialogInfo.type;
+          this.formInfo.ref.validate(valid => {
+            if (valid) {
+              this.btnLoading = true;
+              const params = {
+                data: this.formInfo.data
+              }
+              this.$http.post(this.nozzle.sysEquipAddUpdate, params).then(res => {
+                if (res.data.code === 1 || res.data.code === 200) {
+                  this.dialogInfo.visible = false;
+                  this.deviceTableInfo.refresh = Math.random();
+                }
+                this.$message({
+                  message: res.data.msg,
+                  type: res.data.code === 1 ? "success" : "error",
+                  showClose: true
+                });
+                this.btnLoading = false;
+              })
+              .catch(e => {
+                console.log(e);
+                this.btnLoading = false;
+              });
+            }
+          });
+          break;
+      }
+    },
+    //重置表单
+    resetForm() {
+      this.formInfo.data = {
+        id: undefined,
+        equipNo: "",
+        equipDesc: "",
+        equipFactory: "",
+        equipFactoryAbb: "",
+        contactName: "",
+        contactMobile: "",
+        siteCode: ""
+      }
+    },
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index da934e0..065f3da 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -989,22 +989,6 @@
 </script>
 
 <style lang="scss" scoped>
-.page-data {
-  @include fd();
-}
-.page-filter {
-  text-align: left;
-}
-.page-content {
-  flex: 1;
-  overflow: hidden;
-  .page-table {
-    height: 100%;
-  }
-  .red {
-    color: red;
-  }
-}
 .btn-group {
   height: 100%;
   @include fdaj(center, center);
diff --git a/src/components/common/PageTable/index.vue b/src/components/common/PageTable/index.vue
index aade3fc..0536b03 100644
--- a/src/components/common/PageTable/index.vue
+++ b/src/components/common/PageTable/index.vue
@@ -87,7 +87,7 @@
               v-has="item.has ? item.has : ''"
               :disabled="item.disabled"
               :loading="scope.row[item.loading]"
-              @click="handleClick(item.event, scope.row)"
+              @click="handleClick(item.event, scope.row, scope.$index)"
             >
               {{ item.label }}
             </el-button>
@@ -102,7 +102,7 @@
         layout="total, sizes, prev, pager, next, jumper"
         :total="listInfo.total"
         :pager-count="5"
-        :page-sizes="[20, 50, 100, 500, 1000]"
+        :page-sizes="[10, 50, 100, 500, 1000]"
         :page-size="listInfo.query.size"
         :current-page.sync="listInfo.query.current"
         @current-change="handleCurrentChange"
@@ -207,7 +207,7 @@
         loading:false,  //加载动画
         query:{ //查询条件
           current:1,  //当前页
-          size:20,  //每页条数
+          size:10,  //每页条数
         }
       },
     }
@@ -250,8 +250,8 @@
       this.$emit('handleEvent', this.type, rows);
     },
     //派发按钮点击事件
-    handleClick(event, data){
-      this.$emit('handleClick', event, data);
+    handleClick(event, data, index){
+      this.$emit('handleClick', event, data, index);
     },
     /**
       * 通过key找到在列表中对应的显示
diff --git a/src/components/configure/RtuConfig.vue b/src/components/configure/RtuConfig.vue
index c323511..41964ed 100644
--- a/src/components/configure/RtuConfig.vue
+++ b/src/components/configure/RtuConfig.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="content">
+  <div class="content">
     <div
       v-if="formAll && formAllBody && formAllBody.length"
       style="text-align:left;padding:10px"
@@ -865,75 +865,105 @@
   // }
 };
 </script>
-<style scoped>
-#content{
+<style lang="scss" scoped>
+.content{
     width: 100% !important;
     height: 100% !important;
+    #navMenuContent {
+      /* height: calc(100% - 20px);
+      width: calc(100% - 20px);
+      float: left;
+      border: 1px solid aqua;
+      box-sizing: border-box;
+      margin: 10px;
+      position: relative; */
+      width: 100%;
+      /* background-color: #fff; */
+    }
+    /deep/ .switchContent {
+      // color: rgb(99, 96, 96);
+      color: red;
+      /* background-color: #fff; */
+      /* background-color: #fff; */
+      // color: white !important;
+      
+      padding: 2%;
+      .el-form-item__content .el-input .el-input__inner {
+        color: var(--white);
+      }
+      .el-form-item .el-form-item__label{
+        color: var(--white);
+      }
+      .el-form-item__content i{
+          font-style:normal !important;
+          padding-right: 5px !important;
+      }
+      .el-form-item, .el-form-item-input{
+        margin:11px 0 11px 0 !important;
+      }
+      .rowClass .subTitle {
+        /* height:40px!important; */
+        line-height:51px !important;
+        color:aqua !important;
+        /* margin-top: 11px; */
+      }
+      .el-col .input-switch .el-form-item-input{
+        /* display: flex; */
+        margin: initial !important;
+      }
+      .rowClass .el-col{
+        height: 51px !important;
+      }
+      .form-switch .el-form-item__label{
+        width: 180px !important;
+      }
+     .form-switch .el-form-item__content{
+        width: 150px !important;
+        margin-left: 150px !important;
+      }
+      .input-switch .el-form-item__content{
+        margin-left: 0 !important;
+      }
+      .input-switch-div{
+        position:absolute !important;
+        left:0 !important;
+        top:0 !important;
+        width:1000px !important;
+        display:flex !important;
+      }
+      .el-col .input-switch-div .el-form-item__content{
+        width: 66px !important
+      }
+    }
+    // /deep/.el-menu-item{
+    //   background-color: #fff !important;
+    // }
+    /deep/ .el-menu{
+      // background-color: var(--dialogtitle)!important;
+      .el-menu-item{
+        background-color: #fff !important;
+      }
+      .el-menu-item.is-active {
+        // background-color: var(--dialogtitle)!important;
+        // background-color: #fff !important;
+      }
+      .el-menu-item:hover {
+        background-color: #fff !important;
+      }
+    } 
+    // .el-menu--horizontal>.el-menu-item.is-active{
+    //   background-color: #fff !important;
+    // }
+    // .el-menu-item .is-active {
+    //   background-color: #fff !important;
+    // }
+    // .el-menu-item:hover {
+    //   background-color: #fff !important;
+    // }
+    // /deep/ .el-menu-item {
+    //   background-color: #fff!important;
+    // }
+    
 }
-#navMenuContent {
-  /* height: calc(100% - 20px);
-  width: calc(100% - 20px);
-  float: left;
-  border: 1px solid aqua;
-  box-sizing: border-box;
-  margin: 10px;
-  position: relative; */
-  width: 100% !important;
-  /* background-color: #fff; */
-}
-.switchContent {
-  color: rgb(99, 96, 96);
-  /* background-color: #fff; */
-  /* background-color: #fff; */
-  padding: 2% !important;
-}
-.el-menu-item.is-active {
-  background-color: #fff !important;
-}
-.el-menu-item:hover {
-  background-color: #fff !important;
-}
-.el-form-item__content >>> .el-input .el-input__inner {
-  color: black !important;
-}
-.el-form-item__content >>> i{
-    font-style:normal !important;
-    padding-right: 5px !important;
-}
-.el-form-item, .el-form-item-input{
-  margin:11px 0 11px 0 !important;
-}
-.rowClass  >>> .subTitle {
-  /* height:40px!important; */
-  line-height:51px !important;
-  color:aqua !important;
-  /* margin-top: 11px; */
-}
-.el-col >>> .input-switch  .el-form-item-input{
-  /* display: flex; */
-  margin: initial !important;
-}
-.rowClass >>> .el-col{
-  height: 51px !important;
-}
-.form-switch >>> .el-form-item__label{
-  width: 180px !important;
-}
-.form-switch >>> .el-form-item__content{
-  width: 150px !important;
-  margin-left: 150px !important;
-}
-.input-switch >>> .el-form-item__content{
-  margin-left: initial !important;
-}
-.input-switch-div{
-  position:absolute !important;
-  left:0 !important;
-  top:0 !important;
-  width:1000px !important;
-  display:flex !important;
-}
-.el-col >>> .input-switch-div .el-form-item__content{
-  width: 66px !important
-}
+
 </style>
diff --git a/src/components/index.vue b/src/components/index.vue
index eb7f8de..4822fc8 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -98,6 +98,9 @@
                 v-has="'m11-2'"
                 >站点管理</el-menu-item
               >
+              <el-menu-item index="/ConfigManager/device" v-has="'m11-3'"
+                >设备管理</el-menu-item
+              >
             </el-submenu>
             <el-submenu index="5" v-has="'m4'">
               <template slot="title">
diff --git a/src/components/sys/menu.vue b/src/components/sys/menu.vue
index 7ddc09a..7eae9ae 100644
--- a/src/components/sys/menu.vue
+++ b/src/components/sys/menu.vue
@@ -224,6 +224,16 @@
       DialogTitle: "" //弹窗标题
     };
   },
+  watch: {
+    AddDialog(val) {
+      if(!val) {
+        if(this.$refs['ruleForm']) {
+          this.$refs['ruleForm'].resetFields();
+        }
+        this.resetForm();
+      }
+    }
+  },
   methods: {
     // 获取所有的用户
     loadGridData() {
@@ -257,9 +267,12 @@
     },
     // 点击新增子项
     AddChild(index, rows) {
-      this.$nextTick(function() {
-        this.$refs["ruleForm"].resetFields();
-      });
+      // this.$nextTick(function() {
+      //   this.$refs["ruleForm"].resetFields();
+      // });
+      // setTimeout(() => {
+      //   this.$refs["ruleForm"].resetFields();
+      // }, 0);
       this.AddDialog = true;
 
       this.ruleForm.parentId = rows.menuId;
@@ -349,6 +362,18 @@
       // this.ruleForm.orderNum = rows.orderNum;
 
       this.addAndEditURL = this.nozzle.menuUpdateMenu;
+    },
+    //重置表单
+    resetForm() {
+      this.ruleForm = {
+        parentId: "", //默认为0，新增一级架构时传0
+        menuId: "", //只在修改时起作用
+        // 需要进行操作的四个值
+        name: "",
+        perms: "", //权限标识
+        orderNum: "",
+        type: "" //类型
+      }
     }
   },
   mounted: function() {
diff --git a/src/element/index.js b/src/element/index.js
index 781e688..160da1f 100644
--- a/src/element/index.js
+++ b/src/element/index.js
@@ -119,7 +119,7 @@
 Vue.use(Row)
 Vue.use(Col)
 Vue.use(Upload)
-// Vue.use(Progress)
+Vue.use(Progress)
 // Vue.use(Badge)
 Vue.use(Card)
 // Vue.use(Rate)
diff --git a/src/router/index.js b/src/router/index.js
index 603140c..56393e2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -67,16 +67,21 @@
           component: (resolve) => require(["@/components/configure/PatrolConfiguration"],resolve)
         },
         {
-          path: "/ConfigManager/project", // 配置管理--项目权限配置设置
+          path: "/ConfigManager/project", // 配置管理--项目设置
           name: "ProjectConfigManager",
           component: (resolve) => require(["@/components/ConfigManager/project"],resolve)
         },
         {
-          path: "/ConfigManager/SiteManagement", // 配置管理--项目权限配置设置
+          path: "/ConfigManager/SiteManagement", // 配置管理--站点设置
           name: "SiteManagement",
           component: (resolve) => require(["@/components/ConfigManager/SiteManagement"],resolve)
         },
         {
+          path: "/ConfigManager/device", // 配置管理--设备管理
+          name: "DeviceConfigManager",
+          component: (resolve) => require(["@/components/ConfigManager/device"],resolve)
+        },
+        {
           path: "/MessageManagement/MessageQuery", // 消息管理--消息查询
           name: "MessageQuery",
           component: (resolve) => require(["@/components/MessageManagement/MessageQuery"],resolve)
@@ -184,7 +189,8 @@
   if (to.name === "login") {
     next();
   } else if (JSON.parse(getSession("logins")) === "true") {
-    store
+    if(!store.state.common.allDept.length) {
+      store
       .dispatch("common/getAllDept")
       .then(res => {
         store.dispatch("common/getAllCity").then(() => {
@@ -196,6 +202,7 @@
         removeSession("logins");
         next("/Login");
       });
+    }
     next();
   } else {
     message({

diff --git a/src/App.vue b/src/App.vue
index c80ed45..cf24765 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -23,8 +23,4 @@
   color: #2c3e50;
   height: 100%;
 }
-
-.ss {
-  color: ;
-}
 </style>
diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index 53fadc2..7f0ac82 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -68,3 +68,41 @@
 .el-textarea .el-input__count {
   background: transparent;
 }
+/****页面通用样式****/
+.page-data {
+  display: flex;
+  flex-direction: column;
+}
+.page-data .page-filter {
+  text-align: left;
+}
+.page-data .page-content,
+.el-dialog__body .page-content {
+  flex: 1;
+  overflow: hidden;
+}
+.page-data .page-content .page-table {
+  height: 100%;
+}
+.page-data .page-content .page-table .red {
+  color: red;
+}
+.page-data-dialog .el-dialog {
+  display: flex;
+  flex-direction: column;
+  height: 60%;
+  max-height: 60%;
+  margin-top: 10vh !important;
+}
+.page-data-dialog .el-dialog__body {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  padding: 20px;
+  overflow-y: auto;
+}
+.page-data-dialog .el-pagination__sizes,
+.page-data-dialog .el-pagination__total,
+.page-data-dialog .el-pagination__jump {
+  display: none;
+}
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 9fe4611..5d045c0 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -1,15 +1,12 @@
 <template>
   <div id="pagetwo">
     <div class="form">
-      <span class="SelectTitle">站点编号/站点名:</span>
       <el-input
         v-model="searchStr"
         placeholder="请输入站点编号或站点名称"
         clearable
         @change="handleChangeSearch"
       ></el-input>
-      <span class="SelectTitle">时间选择:</span>
-
       <el-date-picker
         v-model="startDate"
         value-format="yyyy-MM-dd"
@@ -43,39 +40,20 @@
     </div>
 
     <el-table :data="listExtend" style="width: 100%; height: calc(100% - 82px)">
-      <el-table-column
-        type="index"
-        label="序号"
-        max-
-        width="70"
-      ></el-table-column>
+      <el-table-column type="index" label="序号" width="70"></el-table-column>
       <el-table-column
         prop="stCode"
         label="站点编号"
-        max-width="130"
+        max-width="120"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
         prop="stName"
         label="站点名称"
         show-overflow-tooltip
-        max-width="200"
-      ></el-table-column>
-      <el-table-column
-        prop="createTime"
-        label="站点安装时间"
-        max-width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="person"
-        label="安装人"
         max-width="150"
       ></el-table-column>
-      <el-table-column
-        prop="tt"
-        label="首次数据接入时间"
-        max-width="180"
-      ></el-table-column>
-      <el-table-column label="站点类型" max-width="150">
+      <el-table-column label="站点类型" width="120">
         <template slot-scope="scope">
           <div>
             <span v-if="scope.row.stationType == 0">水质站</span>
@@ -84,7 +62,36 @@
           </div>
         </template></el-table-column
       >
-      <el-table-column label="操作" max-width="150">
+      <el-table-column
+        prop="createTime"
+        label="站点安装时间"
+        max-width="180"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="person"
+        label="安装人"
+        width="120"
+      ></el-table-column>
+      <el-table-column label="关联设备" width="80">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            size="small"
+            v-if="scope.row.equips.length"
+            @click="handleClick('look', scope.row)"
+            >查看设备</el-button
+          >
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="tt"
+        label="首次数据接入时间"
+        max-width="180"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column label="操作" width="80">
         <template slot-scope="scope">
           <el-button
             type="text"
@@ -129,7 +136,7 @@
               class="selectInput"
               size="small"
               v-model="ruleForm.stationType"
-              placeholder="请选择"
+              placeholder="请选择站点类型"
             >
               <el-option
                 class="selectOption"
@@ -141,6 +148,23 @@
             </el-select>
             <span>按实际设备类型选择站点类型</span>
           </el-form-item>
+          <el-form-item label="所属项目" prop="platformCode">
+            <el-select
+              class="selectInput"
+              size="small"
+              filterable
+              v-model="ruleForm.platformCode"
+              placeholder="请选择所属项目"
+            >
+              <el-option
+                class="selectOption"
+                v-for="item in projectList"
+                :key="item.id"
+                :label="item.key"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="所属区域" prop="area">
             <el-cascader
               ref="cascader"
@@ -149,6 +173,7 @@
               v-model="ruleForm.area"
               :options="syscityList"
               filterable
+              placeholder="请选择所属区域"
               :props="syscityListProps"
               @change="handleChange"
               @visible-change="visiblechange"
@@ -238,7 +263,28 @@
         <el-button type="primary" @click="saveOru('ruleForm')">保存</el-button>
       </span>
     </el-dialog>
-
+    <!--关联设备弹窗-->
+    <page-dialog
+      class="page-data-dialog"
+      :title="dialogInfo.title[dialogInfo.type]"
+      :visible.sync="dialogInfo.visible"
+      :width="dialogInfo.width"
+      :bt-loading="dialogInfo.btLoading"
+      :bt-list="dialogInfo.btList"
+      @handleClick="handleClick"
+    >
+      <page-table
+        tabIndex
+        :api-url="deviceTableInfo.url"
+        :refresh="deviceTableInfo.refresh"
+        :data.sync="deviceTableInfo.data"
+        :query="deviceFilterInfo.query"
+        :init-curpage="deviceTableInfo.initCurpage"
+        :field-list="deviceTableInfo.fieldList"
+        :handle="deviceTableInfo.handle"
+        @handleClick="handleClick"
+      />
+    </page-dialog>
     <el-pagination
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
@@ -328,6 +374,13 @@
             trigger: "change"
           }
         ],
+        platformCode: [
+          {
+            required: true,
+            message: "请选择所属项目",
+            trigger: "change"
+          }
+        ],
         stName: [
           {
             required: true,
@@ -374,13 +427,119 @@
       value: [],
       // 站点管理/所属区域数组
       syscityList: [],
-      syscityListProps: { checkStrictly: true, value: "id", label: "name" }
+      syscityListProps: { checkStrictly: true, value: "id", label: "name" },
+      //当前用户权限内的项目数据
+      projectList: [],
+      //弹窗相关
+      dialogInfo: {
+        title: {
+          look: "关联设备列表"
+        },
+        width: "60%",
+        visible: false,
+        btLoading: false,
+        type: "",
+        btList: [
+          { label: "关闭", type: "", icon: "", event: "close", show: true }
+        ]
+      },
+      //设备搜索相关
+      deviceFilterInfo: {
+        query: {
+          searchStr: "",
+          startDate: "",
+          endDate: ""
+        },
+        list: [
+          {
+            type: "input",
+            label: "设备名称/编号",
+            value: "searchStr",
+            hideLabel: true
+          },
+          {
+            type: "date",
+            label: "开始时间",
+            value: "startDate",
+            dateType: "date",
+            datePickerOptions: "pickerOptionsStart",
+            hideLabel: true
+          },
+          {
+            type: "date",
+            label: "结束时间",
+            value: "endDate",
+            dateType: "date",
+            datePickerOptions: "pickerOptionsEnd",
+            hideLabel: true
+          },
+          {
+            type: "button",
+            label: "查询",
+            btType: "primary",
+            icon: "",
+            event: "search",
+            show: true
+          },
+          {
+            type: "button",
+            label: "添加设备",
+            btType: "primary",
+            icon: "",
+            event: "create",
+            show: true,
+            has: "m11-3-1"
+          }
+        ]
+      },
+      //设备表格相关
+      deviceTableInfo: {
+        url: "", //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [],
+        fieldList: [
+          { label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
+          {
+            label: "设备描述",
+            value: "equipDesc",
+            minWidth: 150,
+            tooltip: true
+          },
+          {
+            label: "设备厂家",
+            value: "equipFactory",
+            minWidth: 150,
+            tooltip: true
+          },
+          { label: "联系人", value: "contactName", width: 100 },
+          { label: "电话", value: "contactMobile", width: 120 }
+        ],
+        handle: {
+          fixed: "right",
+          label: "操作",
+          width: "80",
+          btList: [
+            {
+              label: "解绑",
+              size: "small",
+              type: "text",
+              event: "remove",
+              show: true,
+              has: "m11-3-3"
+            }
+          ]
+        }
+      },
+      //需要进行操作的站点Code
+      needHandleSiteCode: ""
     };
   },
   mounted() {
     this.getsyscityList();
     this.getlistExtend();
     this.getsityType();
+    this.getCurrentUserProject(); //获取当前用户所绑定的项目
   },
   watch: {
     "ruleForm.area": {
@@ -406,6 +565,12 @@
           this.dialogImageUrl = "";
         }
       }
+    },
+    "dialogInfo.visible"(val) {
+      if (!val) {
+        this.deviceTableInfo.data = [];
+        this.dialogInfo.btLoading = false;
+      }
     }
   },
   methods: {
@@ -523,7 +688,6 @@
     },
     // 获取站点列表
     async getlistExtend() {
-      // console.log(this.TimeValue);
       const { data } = await this.$http.post(this.nozzle.listExtend, {
         current: this.currentPage,
         data: {
@@ -554,7 +718,6 @@
             })
             .then(res => {
               this.yzaddflag = false;
-              this.getlistExtend();
             });
         }
       });
@@ -583,19 +746,18 @@
     // 添加站点
     addform(formName) {
       this.yzaddflag = true;
+      // 获取地区列表
       this.title = "新增站点";
     },
     // 操作里面的修改弹窗
     EditFZ(index, rows) {
       // 获取地区列表
-      // console.log(rows);
       for (let key in rows) {
         if (key === "stationType") {
           rows[key] = rows[key].toString();
         }
         this.ruleForm[key] = rows[key];
       }
-      // console.log(this.ruleForm);
       this.yzaddflag = true;
       this.title = "修改站点";
       this.FenZuflag2type = 2;
@@ -616,9 +778,79 @@
           siteType: "site_type"
         }
       });
-
       this.siteTypeList = data.data;
     },
+    //获取当前用户所绑定的项目
+    getCurrentUserProject() {
+      this.$http
+        .post(this.nozzle.sysPlatformList, {
+          current: 0,
+          size: 0,
+          data: { searchStr: "", startDate: "", endDate: "" }
+        })
+        .then(res => {
+          if (res.data.code === 1) {
+            this.projectList = res.data.data.list.map(item => {
+              return {
+                id: item.id,
+                key: item.name,
+                value: item.platformCode
+              };
+            });
+          }
+        });
+    },
+    //点击事件
+    handleClick(event, data, index) {
+      switch (event) {
+        //查看关联设备
+        case "look":
+          this.dialogInfo.visible = true;
+          this.dialogInfo.type = event;
+          this.deviceTableInfo.data = data.equips;
+          this.needHandleSiteCode = data.stCode;
+          break;
+        //解绑设备与站点
+        case "remove":
+          this.$confirm("此操作将解除设备和站点的绑定关系, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+            .then(res => {
+              const params = {
+                data: {
+                  siteCode: this.needHandleSiteCode,
+                  equipNos: [data.equipNo]
+                }
+              };
+              this.$http
+                .post(this.nozzle.sysEquipRemoveBatch, params)
+                .then(res => {
+                  if (res.data.code === 1 || res.data.code === 200) {
+                    this.deviceTableInfo.data.splice(index, 1);
+                    this.getlistExtend();
+                  }
+                  this.$message({
+                    message: res.data.msg,
+                    type: res.data.code === 1 ? "success" : "error",
+                    showClose: true
+                  });
+                })
+                .catch(e => {
+                  message(e);
+                });
+            })
+            .catch(() => {});
+          break;
+        //关闭
+        case "close":
+          setTimeout(() => {
+            this.dialogInfo.visible = false;
+          }, 0);
+          break;
+      }
+    },
     // 关闭弹框后做的操作
     closedialog(formName) {
       this.$refs["ruleForm"].resetFields();
@@ -648,7 +880,7 @@
       };
       this.$refs.cascader.$refs.panel.activePath = [];
       this.$refs.cascader.$refs.panel.clearCheckedNodes();
-      this.getlistExtend();
+      // this.getlistExtend();
     },
     handleChange(value) {
       // 取选中数组的最后一项的id
diff --git a/src/components/ConfigManager/device.vue b/src/components/ConfigManager/device.vue
new file mode 100644
index 0000000..f800811
--- /dev/null
+++ b/src/components/ConfigManager/device.vue
@@ -0,0 +1,297 @@
+<template>
+  <div class="page-data">
+    <!--搜素框-->
+    <div class="page-filter">
+      <page-filter
+        :query.sync="deviceFilterInfo.query"
+        :filter-list="deviceFilterInfo.list"
+        @handleClick="handleClick"
+      />
+    </div>
+    <div class="page-content">
+      <!--表格-->
+      <div class="h-100">
+        <page-table
+          tabIndex
+          pagination
+          :api-url="deviceTableInfo.url"
+          :refresh="deviceTableInfo.refresh"
+          :data.sync="deviceTableInfo.data"
+          :query="deviceFilterInfo.query"
+          :page-query="deviceTableInfo.pageQuery"
+          :list-type-info="listTypeInfo"
+          :init-curpage="deviceTableInfo.initCurpage"
+          :field-list="deviceTableInfo.fieldList"
+          :handle="deviceTableInfo.handle"
+          @handleClick="handleClick"
+        >
+          <template v-slot:col-status="scope">
+            <el-button type="text" size="small" :class="[scope.row.status === 1 ? '' : 'red']">
+              {{ scope.row.status === 1 ? "管理中" : "未管理" }}
+            </el-button>
+          </template>
+        </page-table>
+      </div>
+    </div>
+    <!--弹窗-->
+    <page-dialog
+      :title="dialogInfo.title[dialogInfo.type]"
+      :visible.sync="dialogInfo.visible"
+      :width="dialogInfo.width"
+      :bt-loading="dialogInfo.btLoading"
+      :bt-list="dialogInfo.btList"
+      @handleClick="handleClick"
+    >
+      <page-form
+        :ref-obj.sync="formInfo.ref"
+        :data="formInfo.data"
+        :field-list="formInfo.fieldList"
+        :rules="formInfo.rules"
+        :label-width="formInfo.labelWidth"
+        :list-type-info="listTypeInfo"
+        @handleClick="handleClick"
+      />
+    </page-dialog>
+  </div>
+</template>
+
+<script>
+import { message } from "./../../util/item";
+export default {
+  data() {
+    // 验证电话
+    let checkPhone = (rule, value, callback) => {
+      let check = this.$validate({ label: "电话", value, rules: ["phone"] });
+      if (!check.result) {
+        callback(new Error(check.message));
+      } else {
+        callback();
+      }
+    };
+    return {
+      //设备搜索相关
+      deviceFilterInfo: {
+        query: {
+          searchStr: "",
+          startDate: "",
+          endDate: ""
+        },
+        list: [
+          {type: "input", label: "设备名称/编号", value: "searchStr", hideLabel: true },
+          {type: "date", label: "开始时间", value: "startDate", dateType: "date", datePickerOptions: "pickerOptionsStart", hideLabel: true},
+          {type: "date", label: "结束时间", value: "endDate", dateType: "date", datePickerOptions: "pickerOptionsEnd", hideLabel: true},
+          {type: "button", label: "查询", btType: "primary", icon: "", event: "search", show: true},
+          {type: "button", label: "添加设备", btType: "primary", icon: "", event: "create", show: true, has: "m11-3-1"}
+        ]
+      },
+      //设备表格相关
+      deviceTableInfo: {
+        url: this.nozzle.sysEquipList, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [
+          {equipNo:1000,equipDesc:"3333",equipFactory:'4444'}
+        ],
+        fieldList: [
+          { label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
+          { label: "设备描述", value: "equipDesc", minWidth: 150, tooltip: true },
+          { label: "设备厂家", value: "equipFactory", minWidth: 150, tooltip: true },
+          { label: "厂家简称", value: "equipFactoryAbb", minWidth: 100, tooltip: true },
+          { label: "联系人", value: "contactName", width: 100 },
+          { label: "电话", value: "contactMobile", width: 120 },
+          { label: "站点编号", value: "siteCode", minWidth: 100, tooltip: true },
+          { label: "更新时间", value: "updateTime", minWidth: 150, tooltip: true }
+        ],
+        handle: {
+          fixed: "right",
+          label: "操作",
+          width: "120",
+          btList: [
+            { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-3-2' },
+            { label: "删除", size: "small", type: "text", event: "delete", show: true, has: 'm11-3-3' }
+          ]
+        }
+      },
+      //设备表单相关
+      formInfo: {
+        ref: null,
+        data: {
+          id: undefined,
+          equipNo: "",
+          equipDesc: "",
+          equipFactory: "",
+          equipFactoryAbb: "",
+          contactName: "",
+          contactMobile: "",
+          siteCode: ""
+        },
+        fieldList: [
+          { label: "设备编号", value: "equipNo", type: "input", required: true },
+          { label: "设备描述", value: "equipDesc", type: "input", required: true },
+          { label: "设备厂家", value: "equipFactory", type: "input", required: true },
+          { label: "厂家简称", value: "equipFactoryAbb", type: "input", required: true },
+          { label: "联系人", value: "contactName", type: "input", required: true },
+          { label: "电话", value: "contactMobile", type: "input", required: true, validator: checkPhone },
+          { label: "站点编号", value: "siteCode", type: "select", list: "siteList", filterable:true, required: true },
+        ],
+        rules: {},
+      },
+      //列表相关
+      listTypeInfo:{
+        siteList:[]
+      },
+      //弹窗相关
+      dialogInfo:{
+        title: {
+          update: '编辑设备',
+          create: '添加设备'
+        },
+        width: '500px',
+        visible: false,
+        btLoading: false,
+        type: '',
+        btList: [
+          {label:'关闭',type:'',icon:'',event:'close',show:true},
+          {label:'保存',type:'primary',icon:'',event:'save',show:true,loading:true}
+        ]
+      },
+    }
+  },
+  watch: {
+    "dialogInfo.visible"(val) {
+      if (!val) {
+        if (this.formInfo.ref) {
+          this.formInfo.ref.resetFields();
+        }
+        this.resetForm();
+        this.btnLoading = false;
+      }
+    },
+  },
+  created() {
+    this.initSiteData();
+  },
+  mounted() {
+    this.initRules();
+    this.deviceTableInfo.refresh = Math.random();
+  },
+  methods: {
+    //初始化验证
+    initRules() {
+      const formInfo = this.formInfo;
+      formInfo.rules = this.$initRules(formInfo.fieldList);
+    },
+    //初始化站点数据
+    initSiteData() {
+      this.$http.post(this.nozzle.listExtend, {
+        current: 0,
+        data: {searchStr: "",startDate: "",endDate: ""},
+        size: 0
+      }).then(res =>{
+        if(res.data.code === 1) {
+          this.listTypeInfo.siteList = res.data.data.list.map(item =>{
+            return {
+              key: item.stName,
+              value: item.stCode
+            }
+          })
+        }
+      })
+    },
+    //点击事件
+    handleClick(event, data) {
+      switch (event) {
+        //设备搜索
+        case "search":
+          this.deviceTableInfo.initCurpage = Math.random();
+          this.deviceTableInfo.refresh = Math.random();
+          break;
+        //设备添加按钮
+        case "create":
+          this.dialogInfo.type = event;
+          this.dialogInfo.visible = true;
+          break;
+        //编辑设备按钮
+        case "update":
+          this.dialogInfo.type = event;
+          this.dialogInfo.visible = true;
+          for (let key in data) {
+            if (key in this.formInfo.data) {
+              this.formInfo.data[key] = data[key];
+            }
+          }
+          break;
+        //删除设备按钮
+        case "delete":
+          this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(res =>{
+            this.$http.post(this.nozzle.sysEquipDelete,{data:{equipNo:data.equipNo}}).then(res =>{
+              if(res.data.code === 1 || res.data.code === 200) {
+                this.deviceTableInfo.refresh = Math.random();
+                this.deviceTableInfo.initCurpage = Math.random();
+              }
+              this.$message({
+                message: res.data.msg,
+                type: res.data.code === 1 ? 'success' : 'error',
+                showClose: true,
+              })
+            }).catch(e =>{
+              message(e);
+            })
+          }).catch(() =>{})
+          break;
+        //关闭
+        case "close":
+          setTimeout(() => {
+            this.dialogInfo.visible = false;
+          }, 0);
+          break;
+        //保存表单
+        case "save":
+          const type = this.dialogInfo.type;
+          this.formInfo.ref.validate(valid => {
+            if (valid) {
+              this.btnLoading = true;
+              const params = {
+                data: this.formInfo.data
+              }
+              this.$http.post(this.nozzle.sysEquipAddUpdate, params).then(res => {
+                if (res.data.code === 1 || res.data.code === 200) {
+                  this.dialogInfo.visible = false;
+                  this.deviceTableInfo.refresh = Math.random();
+                }
+                this.$message({
+                  message: res.data.msg,
+                  type: res.data.code === 1 ? "success" : "error",
+                  showClose: true
+                });
+                this.btnLoading = false;
+              })
+              .catch(e => {
+                console.log(e);
+                this.btnLoading = false;
+              });
+            }
+          });
+          break;
+      }
+    },
+    //重置表单
+    resetForm() {
+      this.formInfo.data = {
+        id: undefined,
+        equipNo: "",
+        equipDesc: "",
+        equipFactory: "",
+        equipFactoryAbb: "",
+        contactName: "",
+        contactMobile: "",
+        siteCode: ""
+      }
+    },
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index da934e0..065f3da 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -989,22 +989,6 @@
 </script>
 
 <style lang="scss" scoped>
-.page-data {
-  @include fd();
-}
-.page-filter {
-  text-align: left;
-}
-.page-content {
-  flex: 1;
-  overflow: hidden;
-  .page-table {
-    height: 100%;
-  }
-  .red {
-    color: red;
-  }
-}
 .btn-group {
   height: 100%;
   @include fdaj(center, center);
diff --git a/src/components/common/PageTable/index.vue b/src/components/common/PageTable/index.vue
index aade3fc..0536b03 100644
--- a/src/components/common/PageTable/index.vue
+++ b/src/components/common/PageTable/index.vue
@@ -87,7 +87,7 @@
               v-has="item.has ? item.has : ''"
               :disabled="item.disabled"
               :loading="scope.row[item.loading]"
-              @click="handleClick(item.event, scope.row)"
+              @click="handleClick(item.event, scope.row, scope.$index)"
             >
               {{ item.label }}
             </el-button>
@@ -102,7 +102,7 @@
         layout="total, sizes, prev, pager, next, jumper"
         :total="listInfo.total"
         :pager-count="5"
-        :page-sizes="[20, 50, 100, 500, 1000]"
+        :page-sizes="[10, 50, 100, 500, 1000]"
         :page-size="listInfo.query.size"
         :current-page.sync="listInfo.query.current"
         @current-change="handleCurrentChange"
@@ -207,7 +207,7 @@
         loading:false,  //加载动画
         query:{ //查询条件
           current:1,  //当前页
-          size:20,  //每页条数
+          size:10,  //每页条数
         }
       },
     }
@@ -250,8 +250,8 @@
       this.$emit('handleEvent', this.type, rows);
     },
     //派发按钮点击事件
-    handleClick(event, data){
-      this.$emit('handleClick', event, data);
+    handleClick(event, data, index){
+      this.$emit('handleClick', event, data, index);
     },
     /**
       * 通过key找到在列表中对应的显示
diff --git a/src/components/configure/RtuConfig.vue b/src/components/configure/RtuConfig.vue
index c323511..41964ed 100644
--- a/src/components/configure/RtuConfig.vue
+++ b/src/components/configure/RtuConfig.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="content">
+  <div class="content">
     <div
       v-if="formAll && formAllBody && formAllBody.length"
       style="text-align:left;padding:10px"
@@ -865,75 +865,105 @@
   // }
 };
 </script>
-<style scoped>
-#content{
+<style lang="scss" scoped>
+.content{
     width: 100% !important;
     height: 100% !important;
+    #navMenuContent {
+      /* height: calc(100% - 20px);
+      width: calc(100% - 20px);
+      float: left;
+      border: 1px solid aqua;
+      box-sizing: border-box;
+      margin: 10px;
+      position: relative; */
+      width: 100%;
+      /* background-color: #fff; */
+    }
+    /deep/ .switchContent {
+      // color: rgb(99, 96, 96);
+      color: red;
+      /* background-color: #fff; */
+      /* background-color: #fff; */
+      // color: white !important;
+      
+      padding: 2%;
+      .el-form-item__content .el-input .el-input__inner {
+        color: var(--white);
+      }
+      .el-form-item .el-form-item__label{
+        color: var(--white);
+      }
+      .el-form-item__content i{
+          font-style:normal !important;
+          padding-right: 5px !important;
+      }
+      .el-form-item, .el-form-item-input{
+        margin:11px 0 11px 0 !important;
+      }
+      .rowClass .subTitle {
+        /* height:40px!important; */
+        line-height:51px !important;
+        color:aqua !important;
+        /* margin-top: 11px; */
+      }
+      .el-col .input-switch .el-form-item-input{
+        /* display: flex; */
+        margin: initial !important;
+      }
+      .rowClass .el-col{
+        height: 51px !important;
+      }
+      .form-switch .el-form-item__label{
+        width: 180px !important;
+      }
+     .form-switch .el-form-item__content{
+        width: 150px !important;
+        margin-left: 150px !important;
+      }
+      .input-switch .el-form-item__content{
+        margin-left: 0 !important;
+      }
+      .input-switch-div{
+        position:absolute !important;
+        left:0 !important;
+        top:0 !important;
+        width:1000px !important;
+        display:flex !important;
+      }
+      .el-col .input-switch-div .el-form-item__content{
+        width: 66px !important
+      }
+    }
+    // /deep/.el-menu-item{
+    //   background-color: #fff !important;
+    // }
+    /deep/ .el-menu{
+      // background-color: var(--dialogtitle)!important;
+      .el-menu-item{
+        background-color: #fff !important;
+      }
+      .el-menu-item.is-active {
+        // background-color: var(--dialogtitle)!important;
+        // background-color: #fff !important;
+      }
+      .el-menu-item:hover {
+        background-color: #fff !important;
+      }
+    } 
+    // .el-menu--horizontal>.el-menu-item.is-active{
+    //   background-color: #fff !important;
+    // }
+    // .el-menu-item .is-active {
+    //   background-color: #fff !important;
+    // }
+    // .el-menu-item:hover {
+    //   background-color: #fff !important;
+    // }
+    // /deep/ .el-menu-item {
+    //   background-color: #fff!important;
+    // }
+    
 }
-#navMenuContent {
-  /* height: calc(100% - 20px);
-  width: calc(100% - 20px);
-  float: left;
-  border: 1px solid aqua;
-  box-sizing: border-box;
-  margin: 10px;
-  position: relative; */
-  width: 100% !important;
-  /* background-color: #fff; */
-}
-.switchContent {
-  color: rgb(99, 96, 96);
-  /* background-color: #fff; */
-  /* background-color: #fff; */
-  padding: 2% !important;
-}
-.el-menu-item.is-active {
-  background-color: #fff !important;
-}
-.el-menu-item:hover {
-  background-color: #fff !important;
-}
-.el-form-item__content >>> .el-input .el-input__inner {
-  color: black !important;
-}
-.el-form-item__content >>> i{
-    font-style:normal !important;
-    padding-right: 5px !important;
-}
-.el-form-item, .el-form-item-input{
-  margin:11px 0 11px 0 !important;
-}
-.rowClass  >>> .subTitle {
-  /* height:40px!important; */
-  line-height:51px !important;
-  color:aqua !important;
-  /* margin-top: 11px; */
-}
-.el-col >>> .input-switch  .el-form-item-input{
-  /* display: flex; */
-  margin: initial !important;
-}
-.rowClass >>> .el-col{
-  height: 51px !important;
-}
-.form-switch >>> .el-form-item__label{
-  width: 180px !important;
-}
-.form-switch >>> .el-form-item__content{
-  width: 150px !important;
-  margin-left: 150px !important;
-}
-.input-switch >>> .el-form-item__content{
-  margin-left: initial !important;
-}
-.input-switch-div{
-  position:absolute !important;
-  left:0 !important;
-  top:0 !important;
-  width:1000px !important;
-  display:flex !important;
-}
-.el-col >>> .input-switch-div .el-form-item__content{
-  width: 66px !important
-}
+
 </style>
diff --git a/src/components/index.vue b/src/components/index.vue
index eb7f8de..4822fc8 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -98,6 +98,9 @@
                 v-has="'m11-2'"
                 >站点管理</el-menu-item
               >
+              <el-menu-item index="/ConfigManager/device" v-has="'m11-3'"
+                >设备管理</el-menu-item
+              >
             </el-submenu>
             <el-submenu index="5" v-has="'m4'">
               <template slot="title">
diff --git a/src/components/sys/menu.vue b/src/components/sys/menu.vue
index 7ddc09a..7eae9ae 100644
--- a/src/components/sys/menu.vue
+++ b/src/components/sys/menu.vue
@@ -224,6 +224,16 @@
       DialogTitle: "" //弹窗标题
     };
   },
+  watch: {
+    AddDialog(val) {
+      if(!val) {
+        if(this.$refs['ruleForm']) {
+          this.$refs['ruleForm'].resetFields();
+        }
+        this.resetForm();
+      }
+    }
+  },
   methods: {
     // 获取所有的用户
     loadGridData() {
@@ -257,9 +267,12 @@
     },
     // 点击新增子项
     AddChild(index, rows) {
-      this.$nextTick(function() {
-        this.$refs["ruleForm"].resetFields();
-      });
+      // this.$nextTick(function() {
+      //   this.$refs["ruleForm"].resetFields();
+      // });
+      // setTimeout(() => {
+      //   this.$refs["ruleForm"].resetFields();
+      // }, 0);
       this.AddDialog = true;
 
       this.ruleForm.parentId = rows.menuId;
@@ -349,6 +362,18 @@
       // this.ruleForm.orderNum = rows.orderNum;
 
       this.addAndEditURL = this.nozzle.menuUpdateMenu;
+    },
+    //重置表单
+    resetForm() {
+      this.ruleForm = {
+        parentId: "", //默认为0，新增一级架构时传0
+        menuId: "", //只在修改时起作用
+        // 需要进行操作的四个值
+        name: "",
+        perms: "", //权限标识
+        orderNum: "",
+        type: "" //类型
+      }
     }
   },
   mounted: function() {
diff --git a/src/element/index.js b/src/element/index.js
index 781e688..160da1f 100644
--- a/src/element/index.js
+++ b/src/element/index.js
@@ -119,7 +119,7 @@
 Vue.use(Row)
 Vue.use(Col)
 Vue.use(Upload)
-// Vue.use(Progress)
+Vue.use(Progress)
 // Vue.use(Badge)
 Vue.use(Card)
 // Vue.use(Rate)
diff --git a/src/router/index.js b/src/router/index.js
index 603140c..56393e2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -67,16 +67,21 @@
           component: (resolve) => require(["@/components/configure/PatrolConfiguration"],resolve)
         },
         {
-          path: "/ConfigManager/project", // 配置管理--项目权限配置设置
+          path: "/ConfigManager/project", // 配置管理--项目设置
           name: "ProjectConfigManager",
           component: (resolve) => require(["@/components/ConfigManager/project"],resolve)
         },
         {
-          path: "/ConfigManager/SiteManagement", // 配置管理--项目权限配置设置
+          path: "/ConfigManager/SiteManagement", // 配置管理--站点设置
           name: "SiteManagement",
           component: (resolve) => require(["@/components/ConfigManager/SiteManagement"],resolve)
         },
         {
+          path: "/ConfigManager/device", // 配置管理--设备管理
+          name: "DeviceConfigManager",
+          component: (resolve) => require(["@/components/ConfigManager/device"],resolve)
+        },
+        {
           path: "/MessageManagement/MessageQuery", // 消息管理--消息查询
           name: "MessageQuery",
           component: (resolve) => require(["@/components/MessageManagement/MessageQuery"],resolve)
@@ -184,7 +189,8 @@
   if (to.name === "login") {
     next();
   } else if (JSON.parse(getSession("logins")) === "true") {
-    store
+    if(!store.state.common.allDept.length) {
+      store
       .dispatch("common/getAllDept")
       .then(res => {
         store.dispatch("common/getAllCity").then(() => {
@@ -196,6 +202,7 @@
         removeSession("logins");
         next("/Login");
       });
+    }
     next();
   } else {
     message({
diff --git a/src/util/projectSet.js b/src/util/projectSet.js
index d5febff..0fd3668 100644
--- a/src/util/projectSet.js
+++ b/src/util/projectSet.js
@@ -11,6 +11,8 @@
   upload: "/sys/file/upload", //站点管理//上传图片接口
   sityType: "/sys/sysdic/list", //站点管理//站点类型接口
   listExtend: "/sys/stationbase/listExtend", //站点管理//站点列表接口
+  sysEquipRemoveBatch: "/sys/equipinfo/removebatch", //站点管理----解绑设备与站点
+  syscity: "/sys/syscity/list", //获取地区列表
 
   sysPlatformList: "/sys/sysplatform/list ", //项目配置管理----项目列表
   sysStationBaseList: "/sys/stationbase/list", //项目配置管理----站点列表
@@ -18,7 +20,11 @@
   sysStationBaseRemove: "/sys/stationbase/removeBatch", //项目配置管理----移除项目与站点
   sysPlatformUpdate: "/sys/sysplatform/addOrupdate", //项目配置管理----更新/添加项目信息
   sysPlatformDelete: "/sys/sysplatform/delete", //项目配置管理----删除项目
-  sysCityList: "/sys/syscity/list" //项目配置管理----获取所有城市信息
+  sysCityList: "/sys/syscity/list", //项目配置管理----获取所有城市信息
+
+  sysEquipList: "/sys/equipinfo/list", //设备管理----设备列表
+  sysEquipAddUpdate: "/sys/equipinfo/addOrupdate", //设备管理----新增设备
+  sysEquipDelete: "/sys/equipinfo/delete" //设备管理----删除设备
 };
 
 for (let item in nozzle) {