diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index b4e4a8f..440a79e 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -78,6 +78,15 @@
   background: transparent;
 }
 /****页面通用样式****/
+.flex{
+  display: flex;
+}
+.flex-1{
+  flex: 1;
+}
+.flex-d{
+  flex-direction: column;
+}
 .page-data {
   display: flex;
   flex-direction: column;
@@ -108,10 +117,10 @@
   flex-direction: column;
   flex: 1;
   padding: 20px;
+  padding-bottom: 0 !important;
   overflow-y: auto;
 }
 .page-data-dialog .el-pagination__sizes,
-.page-data-dialog .el-pagination__total,
 .page-data-dialog .el-pagination__jump{
-  display: none;
+  display: none !important;
 }
\ No newline at end of file

diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index b4e4a8f..440a79e 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -78,6 +78,15 @@
   background: transparent;
 }
 /****页面通用样式****/
+.flex{
+  display: flex;
+}
+.flex-1{
+  flex: 1;
+}
+.flex-d{
+  flex-direction: column;
+}
 .page-data {
   display: flex;
   flex-direction: column;
@@ -108,10 +117,10 @@
   flex-direction: column;
   flex: 1;
   padding: 20px;
+  padding-bottom: 0 !important;
   overflow-y: auto;
 }
 .page-data-dialog .el-pagination__sizes,
-.page-data-dialog .el-pagination__total,
 .page-data-dialog .el-pagination__jump{
-  display: none;
+  display: none !important;
 }
\ No newline at end of file
diff --git a/src/assets/css/mixin.css b/src/assets/css/mixin.css
deleted file mode 100644
index 9e97d02..0000000
--- a/src/assets/css/mixin.css
+++ /dev/null
@@ -1 +0,0 @@
-/* No CSS *//*# sourceMappingURL=mixin.css.map */
\ No newline at end of file

diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index b4e4a8f..440a79e 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -78,6 +78,15 @@
   background: transparent;
 }
 /****页面通用样式****/
+.flex{
+  display: flex;
+}
+.flex-1{
+  flex: 1;
+}
+.flex-d{
+  flex-direction: column;
+}
 .page-data {
   display: flex;
   flex-direction: column;
@@ -108,10 +117,10 @@
   flex-direction: column;
   flex: 1;
   padding: 20px;
+  padding-bottom: 0 !important;
   overflow-y: auto;
 }
 .page-data-dialog .el-pagination__sizes,
-.page-data-dialog .el-pagination__total,
 .page-data-dialog .el-pagination__jump{
-  display: none;
+  display: none !important;
 }
\ No newline at end of file
diff --git a/src/assets/css/mixin.css b/src/assets/css/mixin.css
deleted file mode 100644
index 9e97d02..0000000
--- a/src/assets/css/mixin.css
+++ /dev/null
@@ -1 +0,0 @@
-/* No CSS *//*# sourceMappingURL=mixin.css.map */
\ No newline at end of file
diff --git a/src/assets/css/mixin.css.map b/src/assets/css/mixin.css.map
deleted file mode 100644
index 356f200..0000000
--- a/src/assets/css/mixin.css.map
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "version": 3,
-    "mappings": "",
-    "sources": [
-        "mixin.scss"
-    ],
-    "names": [],
-    "file": "mixin.css"
-}
\ No newline at end of file

diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index b4e4a8f..440a79e 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -78,6 +78,15 @@
   background: transparent;
 }
 /****页面通用样式****/
+.flex{
+  display: flex;
+}
+.flex-1{
+  flex: 1;
+}
+.flex-d{
+  flex-direction: column;
+}
 .page-data {
   display: flex;
   flex-direction: column;
@@ -108,10 +117,10 @@
   flex-direction: column;
   flex: 1;
   padding: 20px;
+  padding-bottom: 0 !important;
   overflow-y: auto;
 }
 .page-data-dialog .el-pagination__sizes,
-.page-data-dialog .el-pagination__total,
 .page-data-dialog .el-pagination__jump{
-  display: none;
+  display: none !important;
 }
\ No newline at end of file
diff --git a/src/assets/css/mixin.css b/src/assets/css/mixin.css
deleted file mode 100644
index 9e97d02..0000000
--- a/src/assets/css/mixin.css
+++ /dev/null
@@ -1 +0,0 @@
-/* No CSS *//*# sourceMappingURL=mixin.css.map */
\ No newline at end of file
diff --git a/src/assets/css/mixin.css.map b/src/assets/css/mixin.css.map
deleted file mode 100644
index 356f200..0000000
--- a/src/assets/css/mixin.css.map
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "version": 3,
-    "mappings": "",
-    "sources": [
-        "mixin.scss"
-    ],
-    "names": [],
-    "file": "mixin.css"
-}
\ No newline at end of file
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 219a678..281044c 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -1,107 +1,37 @@
 <template>
-  <div id="pagetwo">
-    <div class="form">
-      <el-input
-        v-model="searchStr"
-        placeholder="请输入站点编号或站点名称"
-        clearable
-        @change="handleChangeSearch"
-      ></el-input>
-      <el-date-picker
-        v-model="startDate"
-        value-format="yyyy-MM-dd"
-        :picker-options="pickerOptionsStart"
-        type="date"
-        :clearable="true"
-        placeholder="请选择开始日期"
+  <div id="pagetwo" class="page-data">
+    <!--搜素框-->
+    <div class="page-filter">
+      <page-filter
+        :query.sync="siteFilterInfo.query"
+        :filter-list="siteFilterInfo.list"
+        @handleClick="handleClick"
       />
-      <el-date-picker
-        v-model="endDate"
-        value-format="yyyy-MM-dd"
-        :picker-options="pickerOptionsEnd"
-        type="date"
-        :clearable="true"
-        placeholder="请选择结束日期"
-      />
-      <el-button
-        type="primary"
-        icon="el-icon-search"
-        @click="search"
-        v-has="'Search'"
-        >查询</el-button
-      >
-      <el-button
-        type="primary"
-        icon="el-icon-circle-plus-outline"
-        @click="addform('ruleForm')"
-        v-has="'m11-2-1'"
-        >添加站点</el-button
-      >
     </div>
-
-    <el-table :data="listExtend" style="width: 100%; height: calc(100% - 82px)">
-      <el-table-column
-        type="index"
-        label="序号"
-        width="70"
-      ></el-table-column>
-      <el-table-column
-        prop="stCode"
-        label="站点编号"
-        max-width="120"
-        show-overflow-tooltip
-      ></el-table-column>
-      <el-table-column
-        prop="stName"
-        label="站点名称"
-        show-overflow-tooltip
-        max-width="150"
-      ></el-table-column>
-      <el-table-column label="站点类型" width="120">
-        <template slot-scope="scope">
-          <div>
-            <span v-if="scope.row.stationType == 0">水质站</span>
-            <span v-if="scope.row.stationType == 1">水位站</span>
-            <span v-if="scope.row.stationType == 2">流量站</span>
-          </div>
-        </template></el-table-column
-      >
-      <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"
-            size="small"
-            @click="EditFZ(scope.$index, scope.row)"
-            style="margin: 0 10px"
-            v-has="'m11-2-2'"
-            >修改</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
+    <div class="page-content">
+      <!--表格-->
+      <div class="h-100">
+        <page-table
+          tabIndex
+          pagination
+          :api-url="siteTableInfo.url"
+          :refresh="siteTableInfo.refresh"
+          :data.sync="siteTableInfo.data"
+          :query="siteFilterInfo.query"
+          :page-query="siteTableInfo.pageQuery"
+          :list-type-info="listTypeInfo"
+          :init-curpage="siteTableInfo.initCurpage"
+          :field-list="siteTableInfo.fieldList"
+          :handle="siteTableInfo.handle"
+          @handleClick="handleClick"
+        >
+          <!-- 自定义插槽显示状态 -->
+          <template v-slot:col-equips="scope">
+            <el-button type="text" size="small" @click="handleClick('look',scope.row)">查看设备</el-button>
+          </template>
+        </page-table>
+      </div>
+    </div>
 
     <!-- 新增/修改的弹出框 -->
     <el-dialog
@@ -266,72 +196,138 @@
       class="page-data-dialog"
       :title="dialogInfo.title[dialogInfo.type]"
       :visible.sync="dialogInfo.visible"
-      :width="dialogInfo.width"
+      width="80%"
       :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"
-      />
+      <template v-if="dialogInfo.type === 'look'">
+        <div class="page-filter">
+          <el-form :inline="true" :model="deviceRelatedQuery" ref="deviceRelatedQuery" size="medium">
+            <el-form-item label="">
+              <el-input v-model="deviceRelatedQuery.searchStr" placeholder="请输入设备编号/厂家" clearable></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="medium" @click="handleClick('deviceSearch')">查询</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="page-content">
+          <el-row :gutter="20" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">未关联设备列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="unRelated"
+                :api-url="deviceTableInfo.url"
+                :refresh="deviceTableInfo.refresh"
+                :data.sync="unRelatedDeviceTableInfo.data"
+                :query="unRelatedDeviceTableInfo.query"
+                :init-curpage="deviceTableInfo.initCurpage"
+                :field-list="deviceTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+            <el-col :span="4" class="h-100">
+              <div class="btn-group">
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-right"
+                  :disabled="isCanInsertDevice"
+                  @click="handleClick('insert')"
+                  >添加</el-button
+                >
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-left"
+                  :disabled="isCanRemoveDevice"
+                  @click="handleClick('remove')"
+                  >移除</el-button
+                >
+              </div>
+            </el-col>
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">已关联设备列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="isRelated"
+                :api-url="deviceTableInfo.url"
+                :refresh="deviceTableInfo.refresh"
+                :data.sync="isRelatedDeviceTableInfo.data"
+                :query="isRelatedDeviceTableInfo.query"
+                :init-curpage="deviceTableInfo.initCurpage"
+                :field-list="deviceTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+          </el-row>
+        </div>
+      </template>
     </page-dialog>
-    <el-pagination
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page="currentPage"
-      :page-sizes="[10, 20, 30, 40]"
-      :page-size="PageSize"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="AllTotal"
-    >
-    </el-pagination>
   </div>
 </template>
 <script>
 import axios from "axios";
-
+import { mapGetters } from "vuex";
 export default {
-  name: "StatisticalReport",
   data() {
     return {
+      //站点搜索相关
+      siteFilterInfo: {
+        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: "el-icon-search", event: "search", show: true},
+          {type: "button", label: "添加站点", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-2-1"}
+        ]
+      },
+      //站点表格相关
+      siteTableInfo: {
+        url: this.nozzle.listExtend, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [],
+        fieldList: [
+          { label: "站点编号", value: "stCode", minWidth: 120, tooltip: true },
+          { label: "站点名称", value: "stName", minWidth: 120, tooltip: true },
+          { label: "站点类型", value: "stationTypeName", width: 120 },
+          { label: "站点安装时间", value: "createTime", minWidth: 120, tooltip: true },
+          { label: "安装人", value: "person", width: 120 },
+          { label: "关联设备", value: "equips", width: 100, type: "slot" },
+          { label: "首次数据接入时间", value: "tt", minWidth: 120, tooltip: true },
+        ],
+        handle: {
+          fixed: "right",
+          label: "操作",
+          width: "80",
+          btList: [
+            { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-2-2' }
+          ]
+        }
+      },
+      //列表相关
+      listTypeInfo: {},
       loadingdelet: undefined,
       loading: false,
       timer: null,
       dialogImageUrl: "",
       dialogVisible: false,
-      PageSize: 10,
-      AllTotal: 0,
-      currentPage: 1,
       title: "站点管理",
-      listExtend: [], // 站点管理的返回数据
       siteTypeList: [], //弹框里面站点类型列表
-      searchStr: "",
-      file: [],
-      startDate: "",
-      endDate: "",
-      pickerOptionsStart: {
-        //结束时间不能大于开始时间
-        disabledDate: time => {
-          if (this.endDate) {
-            return time.getTime() > new Date(this.endDate).getTime();
-          }
-        }
-      },
-      pickerOptionsEnd: {
-        disabledDate: time => {
-          return time.getTime() < new Date(this.startDate).getTime();
-        }
-      },
-      List: [],
-      ledlist: [],
       yzaddflag: false,
       ruleForm: {
         id: "", //站点ID
@@ -431,7 +427,7 @@
       //弹窗相关
       dialogInfo:{
         title: {
-          look: '关联设备列表'
+          look: ''
         },
         width: '60%',
         visible: false,
@@ -441,65 +437,65 @@
           {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: '', //接口地址
+        url: this.nozzle.sysEquipRelatedList, //接口地址
         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: "",
+      //已关联设备表格相关
+      isRelatedDeviceTableInfo: {
+        data: [],
+        query: {
+          sign: ""
+        },
+        selectList: []
+      },
+      //未关联设备表格相关
+      unRelatedDeviceTableInfo: {
+        data: [],
+        query: {
+          sign: "unbound"
+        },
+        selectList: []
+      },
+      //设备关联过滤相关
+      deviceRelatedQuery: {
+        searchStr: "",
+        siteCode: ""
+      }
     };
   },
   mounted() {
-    this.getsyscityList();
-    this.getlistExtend();
+    this.siteTableInfo.refresh = Math.random();
     this.getsityType();
     this.getCurrentUserProject(); //获取当前用户所绑定的项目
   },
+  computed: {
+    //移除按钮是否可点击
+    isCanRemoveDevice() {
+      return this.isRelatedDeviceTableInfo.selectList.length ? false : true;
+    },
+    //添加按钮是否可点击
+    isCanInsertDevice() {
+      return this.unRelatedDeviceTableInfo.selectList.length ? false : true;
+    },
+    ...mapGetters(["allDept", "allRole", "allCity"])
+  },
   watch: {
     "ruleForm.area": {
       handler(newVal, oldVal) {
         if (this.$refs.cascader) {
           let children = this.$refs.cascader.getCheckedNodes();
-          // console.log(children);
           if (
             children.length &&
             children[0].children &&
             children[0].children.length < 1
           ) {
-            // console.log(9999);
             this.$refs.cascader.dropDownVisible = false;
           }
         }
@@ -516,30 +512,18 @@
     "dialogInfo.visible"(val) {
       if(!val) {
         this.deviceTableInfo.data = [];
+        this.deviceRelatedQuery.searchStr = "";
         this.dialogInfo.btLoading = false;
       }
+    },
+    "deviceRelatedQuery.searchStr"(val) {
+      Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+      Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
     }
   },
   methods: {
-    //将空的children置为undefined,避免在没有下一级数据的情况下显示暂无数据
-    removeEmptyChild(arr) {
-      arr.forEach(item => {
-        if (!item.children || item.children.length < 1) {
-          item.children = undefined;
-        } else {
-          this.removeEmptyChild(item.children);
-        }
-      });
-      return arr;
-    },
-    handleChangeSearch() {
-      this.currentPage = 1;
-      this.getlistExtend();
-    },
     //上传头像
     fileChange(file) {
-      // console.log(file.size, file.raw.type);
-      // const isJPG = file.raw.type === "image/jpeg";
       this.loading = true;
       const isLt1M = file.size / 1024 / 1024 < 1;
       if (file.raw.type != "image/jpeg" && file.raw.type != "image/png") {
@@ -559,25 +543,24 @@
       let config = {
         headers: { "Content-Type": "multipart/form-data" }
       };
-      axios
-        .post(this.nozzle.upload, formdata, config)
-        .then(res => {
-          if (res.data.code == 1) {
-            this.loading = false;
-            this.$message({
-              message: "上传图片成功！",
-              type: "success"
-            });
-            this.ruleForm.fileList.push(res.data.data[0]);
-          }
-        })
-        .catch(res => {
+      axios.post(this.nozzle.upload, formdata, config).then(res => {
+        if (res.data.code == 1) {
           this.loading = false;
           this.$message({
-            message: "服务器问题！请重试！",
-            type: "warning"
+            message: "上传图片成功！",
+            type: "success"
           });
+          this.ruleForm.fileList.push(res.data.data[0]);
+          this.siteTableInfo.refresh = Math.random();
+        }
+      })
+      .catch(res => {
+        this.loading = false;
+        this.$message({
+          message: "服务器问题！请重试！",
+          type: "warning"
         });
+      });
     },
     // 删除图片按钮
     deleteImg(fileNo) {
@@ -633,39 +616,24 @@
       this.dialogImageUrl = file.fileCloudStorageKey;
       this.dialogVisible = true;
     },
-    // 获取站点列表
-    async getlistExtend() {
-      const { data } = await this.$http.post(this.nozzle.listExtend, {
-        current: this.currentPage,
-        data: {
-          searchStr: this.searchStr,
-          startDate: this.startDate,
-          endDate: this.endDate
-        },
-        size: this.PageSize
-      });
-      this.listExtend = data.data.list;
-      this.AllTotal = data.data.total;
-    },
-    // 搜索查询按钮
-    search() {
-      this.currentPage = 1;
-      this.getlistExtend();
-    },
-    deleteRow(index, rows) {
-      rows.splice(index, 1);
-    },
     // 弹框提交表单按钮
     saveOru(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
-          this.$http
-            .post(this.nozzle.saveOrupdate, {
-              data: this.ruleForm
-            })
-            .then(res => {
+          this.$http.post(this.nozzle.saveOrupdate, {
+            data: this.ruleForm
+          })
+          .then(res => {
+            if(res.data.code === 1) {
+              this.siteTableInfo.refresh = Math.random();
               this.yzaddflag = false;
-            });
+            }
+            this.$message({
+              message: res.data.msg,
+              type: res.data.code === 1 ? 'success' : 'error',
+              showClose: true,
+            })
+          });
         }
       });
     },
@@ -674,7 +642,6 @@
       this.yzaddflag = false;
       this.$refs[formName].resetFields();
     },
-
     visiblechange(visible) {
       if (visible) {
         this.timer = setInterval(() => {
@@ -690,34 +657,6 @@
         clearInterval(this.timer);
       }
     },
-    // 添加站点
-    addform(formName) {
-      this.yzaddflag = true;
-      // 获取地区列表
-      this.title = "新增站点";
-    },
-    // 操作里面的修改弹窗
-    EditFZ(index, rows) {
-      // 获取地区列表
-      for (let key in rows) {
-        if (key === "stationType") {
-          rows[key] = rows[key].toString();
-        }
-        this.ruleForm[key] = rows[key];
-      }
-      this.yzaddflag = true;
-      this.title = "修改站点";
-      this.FenZuflag2type = 2;
-      this.AddFZInput = rows.groupName;
-      this.ClickID = rows.id;
-    },
-    // 获取地区列表数据
-    async getsyscityList() {
-      const { data } = await this.$http.post(this.nozzle.syscity);
-
-      let arr = this.removeEmptyChild(data.data);
-      this.syscityList = data.data;
-    },
     //获取站点类型列表
     async getsityType() {
       const { data } = await this.$http.post(this.nozzle.sityType, {
@@ -745,43 +684,98 @@
         }
       })
     },
+    //表格checkbox选择事件
+    handleEvent(event, data) {
+      switch (event) {
+        case "isRelated":
+          this.isRelatedDeviceTableInfo.selectList = data;
+          break;
+        case "unRelated":
+          this.unRelatedDeviceTableInfo.selectList = data;
+          break;
+      }
+    },
     //点击事件
     handleClick(event, data, index){
       switch(event) {
+        //站点搜索
+        case "search":
+          this.siteTableInfo.initCurpage = Math.random();
+          this.siteTableInfo.refresh = Math.random();
+          break;
+        //添加站点
+        case "create":
+          this.yzaddflag = true;
+          this.title = "新增站点";
+          this.syscityList = this.removeEmptyChild(this.allCity);
+          break;
+        //编辑站点
+        case "update":
+          this.title = "修改站点";
+          for (let key in data) {
+            if (key === "stationType") {
+              data[key] = data[key].toString();
+            }
+            this.ruleForm[key] = data[key];
+          }
+          this.syscityList = this.removeEmptyChild(this.allCity);
+          this.yzaddflag = true;
+          break;
         //查看关联设备
         case "look":
-          this.dialogInfo.visible = true;
           this.dialogInfo.type = event;
-          this.deviceTableInfo.data = data.equips;
-          this.needHandleSiteCode = data.stCode;
+          this.deviceRelatedQuery.siteCode = data.stCode;
+          this.dialogInfo.visible = true;
+          setTimeout(() => {
+            Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+            Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+            this.deviceTableInfo.refresh = Math.random();
+          }, 0);
+          break;
+        //关联设备搜索
+        case "deviceSearch":
+          this.deviceTableInfo.initCurpage = Math.random();
+          this.deviceTableInfo.refresh = Math.random();
+          break;
+        //添加设备到站点
+        case "insert":
+          const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map( item => item.equipNo);
+          const insertData = {
+            siteCode: this.unRelatedDeviceTableInfo.query.siteCode,
+            equipNos: insertEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipInsertBatch, { data: insertData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              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
+            });
+          });
           break;
         //解绑设备与站点
         case "remove":
-          this.$confirm("此操作将解除设备和站点的绑定关系, 是否继续?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(res =>{
-            const params = {
-              data: {
-                siteCode: this.needHandleSiteCode,
-                equipNos: [data.equipNo]
-              }
+          const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(item => item.equipNo);
+          const removeData = {
+            siteCode: this.isRelatedDeviceTableInfo.query.siteCode,
+            equipNos: removeEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipRemoveBatch, { data: removeData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              this.deviceTableInfo.refresh = Math.random();
+              this.deviceTableInfo.initCurpage = Math.random();
             }
-            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(() =>{})
+            this.$message({
+              message: res.data.msg,
+              type: res.data.code === 1 ? "success" : "error",
+              showClose: true
+            });
+          }).catch(e =>{console.log(e)});
           break;
         //关闭
         case "close":
@@ -820,19 +814,21 @@
       };
       this.$refs.cascader.$refs.panel.activePath = [];
       this.$refs.cascader.$refs.panel.clearCheckedNodes();
-      // this.getlistExtend();
     },
     handleChange(value) {
       // 取选中数组的最后一项的id
       this.ruleForm.area = value.slice(-1)[0];
     },
-    handleSizeChange(val) {
-      this.PageSize = val;
-      this.getlistExtend();
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getlistExtend();
+    //将空的children置为undefined,避免在没有下一级数据的情况下显示暂无数据
+    removeEmptyChild(arr) {
+      arr.forEach(item => {
+        if (!item.children || item.children.length < 1) {
+          item.children = undefined;
+        } else {
+          this.removeEmptyChild(item.children);
+        }
+      });
+      return arr;
     }
   },
   destroyed() {
@@ -841,15 +837,10 @@
 };
 </script>
 <style lang="scss" scoped>
-/deep/ .el-pagination .el-pager li.active {
-  background-color: #409eff !important;
-  cursor: default;
-}
 .imgtype {
   width: 150px;
   height: 100px;
 }
-
 /deep/ .el-upload-list {
   display: none;
 }
@@ -858,7 +849,6 @@
   margin: 0 20px 20px 0;
   position: relative;
 }
-
 .deleteSpan {
   position: absolute;
   display: inline-block;
@@ -893,26 +883,33 @@
   width: 200px;
   margin: 0 10px;
 }
-
-.title {
-  height: 50px;
-  line-height: 50px;
+.title, .table-title{
+  @include hl(30px,30px);
+  color: #409EFF;
   text-align: center;
   font-size: 16px;
+  margin-bottom: 10px;
 }
-
 .tableSection {
   padding: 10px;
   background: rgba(270, 255, 255, 0.05);
 }
 /deep/ .el-dialog .el-dialog__body {
   text-align: left;
+  padding-bottom: 0;
 }
-
 .el-dialog .selectInput {
   width: 30% !important;
 }
 .el-dialog .selectInput .el-select-dropdown__empty {
   width: 100% !important;
 }
+.btn-group {
+  height: 100%;
+  @include fdaj(center, center);
+  /deep/ .el-button + .el-button {
+    margin-left: 0;
+    margin-top: 10px;
+  }
+}
 </style>

diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index b4e4a8f..440a79e 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -78,6 +78,15 @@
   background: transparent;
 }
 /****页面通用样式****/
+.flex{
+  display: flex;
+}
+.flex-1{
+  flex: 1;
+}
+.flex-d{
+  flex-direction: column;
+}
 .page-data {
   display: flex;
   flex-direction: column;
@@ -108,10 +117,10 @@
   flex-direction: column;
   flex: 1;
   padding: 20px;
+  padding-bottom: 0 !important;
   overflow-y: auto;
 }
 .page-data-dialog .el-pagination__sizes,
-.page-data-dialog .el-pagination__total,
 .page-data-dialog .el-pagination__jump{
-  display: none;
+  display: none !important;
 }
\ No newline at end of file
diff --git a/src/assets/css/mixin.css b/src/assets/css/mixin.css
deleted file mode 100644
index 9e97d02..0000000
--- a/src/assets/css/mixin.css
+++ /dev/null
@@ -1 +0,0 @@
-/* No CSS *//*# sourceMappingURL=mixin.css.map */
\ No newline at end of file
diff --git a/src/assets/css/mixin.css.map b/src/assets/css/mixin.css.map
deleted file mode 100644
index 356f200..0000000
--- a/src/assets/css/mixin.css.map
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "version": 3,
-    "mappings": "",
-    "sources": [
-        "mixin.scss"
-    ],
-    "names": [],
-    "file": "mixin.css"
-}
\ No newline at end of file
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 219a678..281044c 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -1,107 +1,37 @@
 <template>
-  <div id="pagetwo">
-    <div class="form">
-      <el-input
-        v-model="searchStr"
-        placeholder="请输入站点编号或站点名称"
-        clearable
-        @change="handleChangeSearch"
-      ></el-input>
-      <el-date-picker
-        v-model="startDate"
-        value-format="yyyy-MM-dd"
-        :picker-options="pickerOptionsStart"
-        type="date"
-        :clearable="true"
-        placeholder="请选择开始日期"
+  <div id="pagetwo" class="page-data">
+    <!--搜素框-->
+    <div class="page-filter">
+      <page-filter
+        :query.sync="siteFilterInfo.query"
+        :filter-list="siteFilterInfo.list"
+        @handleClick="handleClick"
       />
-      <el-date-picker
-        v-model="endDate"
-        value-format="yyyy-MM-dd"
-        :picker-options="pickerOptionsEnd"
-        type="date"
-        :clearable="true"
-        placeholder="请选择结束日期"
-      />
-      <el-button
-        type="primary"
-        icon="el-icon-search"
-        @click="search"
-        v-has="'Search'"
-        >查询</el-button
-      >
-      <el-button
-        type="primary"
-        icon="el-icon-circle-plus-outline"
-        @click="addform('ruleForm')"
-        v-has="'m11-2-1'"
-        >添加站点</el-button
-      >
     </div>
-
-    <el-table :data="listExtend" style="width: 100%; height: calc(100% - 82px)">
-      <el-table-column
-        type="index"
-        label="序号"
-        width="70"
-      ></el-table-column>
-      <el-table-column
-        prop="stCode"
-        label="站点编号"
-        max-width="120"
-        show-overflow-tooltip
-      ></el-table-column>
-      <el-table-column
-        prop="stName"
-        label="站点名称"
-        show-overflow-tooltip
-        max-width="150"
-      ></el-table-column>
-      <el-table-column label="站点类型" width="120">
-        <template slot-scope="scope">
-          <div>
-            <span v-if="scope.row.stationType == 0">水质站</span>
-            <span v-if="scope.row.stationType == 1">水位站</span>
-            <span v-if="scope.row.stationType == 2">流量站</span>
-          </div>
-        </template></el-table-column
-      >
-      <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"
-            size="small"
-            @click="EditFZ(scope.$index, scope.row)"
-            style="margin: 0 10px"
-            v-has="'m11-2-2'"
-            >修改</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
+    <div class="page-content">
+      <!--表格-->
+      <div class="h-100">
+        <page-table
+          tabIndex
+          pagination
+          :api-url="siteTableInfo.url"
+          :refresh="siteTableInfo.refresh"
+          :data.sync="siteTableInfo.data"
+          :query="siteFilterInfo.query"
+          :page-query="siteTableInfo.pageQuery"
+          :list-type-info="listTypeInfo"
+          :init-curpage="siteTableInfo.initCurpage"
+          :field-list="siteTableInfo.fieldList"
+          :handle="siteTableInfo.handle"
+          @handleClick="handleClick"
+        >
+          <!-- 自定义插槽显示状态 -->
+          <template v-slot:col-equips="scope">
+            <el-button type="text" size="small" @click="handleClick('look',scope.row)">查看设备</el-button>
+          </template>
+        </page-table>
+      </div>
+    </div>
 
     <!-- 新增/修改的弹出框 -->
     <el-dialog
@@ -266,72 +196,138 @@
       class="page-data-dialog"
       :title="dialogInfo.title[dialogInfo.type]"
       :visible.sync="dialogInfo.visible"
-      :width="dialogInfo.width"
+      width="80%"
       :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"
-      />
+      <template v-if="dialogInfo.type === 'look'">
+        <div class="page-filter">
+          <el-form :inline="true" :model="deviceRelatedQuery" ref="deviceRelatedQuery" size="medium">
+            <el-form-item label="">
+              <el-input v-model="deviceRelatedQuery.searchStr" placeholder="请输入设备编号/厂家" clearable></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="medium" @click="handleClick('deviceSearch')">查询</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="page-content">
+          <el-row :gutter="20" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">未关联设备列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="unRelated"
+                :api-url="deviceTableInfo.url"
+                :refresh="deviceTableInfo.refresh"
+                :data.sync="unRelatedDeviceTableInfo.data"
+                :query="unRelatedDeviceTableInfo.query"
+                :init-curpage="deviceTableInfo.initCurpage"
+                :field-list="deviceTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+            <el-col :span="4" class="h-100">
+              <div class="btn-group">
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-right"
+                  :disabled="isCanInsertDevice"
+                  @click="handleClick('insert')"
+                  >添加</el-button
+                >
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-left"
+                  :disabled="isCanRemoveDevice"
+                  @click="handleClick('remove')"
+                  >移除</el-button
+                >
+              </div>
+            </el-col>
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">已关联设备列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="isRelated"
+                :api-url="deviceTableInfo.url"
+                :refresh="deviceTableInfo.refresh"
+                :data.sync="isRelatedDeviceTableInfo.data"
+                :query="isRelatedDeviceTableInfo.query"
+                :init-curpage="deviceTableInfo.initCurpage"
+                :field-list="deviceTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+          </el-row>
+        </div>
+      </template>
     </page-dialog>
-    <el-pagination
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page="currentPage"
-      :page-sizes="[10, 20, 30, 40]"
-      :page-size="PageSize"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="AllTotal"
-    >
-    </el-pagination>
   </div>
 </template>
 <script>
 import axios from "axios";
-
+import { mapGetters } from "vuex";
 export default {
-  name: "StatisticalReport",
   data() {
     return {
+      //站点搜索相关
+      siteFilterInfo: {
+        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: "el-icon-search", event: "search", show: true},
+          {type: "button", label: "添加站点", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-2-1"}
+        ]
+      },
+      //站点表格相关
+      siteTableInfo: {
+        url: this.nozzle.listExtend, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [],
+        fieldList: [
+          { label: "站点编号", value: "stCode", minWidth: 120, tooltip: true },
+          { label: "站点名称", value: "stName", minWidth: 120, tooltip: true },
+          { label: "站点类型", value: "stationTypeName", width: 120 },
+          { label: "站点安装时间", value: "createTime", minWidth: 120, tooltip: true },
+          { label: "安装人", value: "person", width: 120 },
+          { label: "关联设备", value: "equips", width: 100, type: "slot" },
+          { label: "首次数据接入时间", value: "tt", minWidth: 120, tooltip: true },
+        ],
+        handle: {
+          fixed: "right",
+          label: "操作",
+          width: "80",
+          btList: [
+            { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-2-2' }
+          ]
+        }
+      },
+      //列表相关
+      listTypeInfo: {},
       loadingdelet: undefined,
       loading: false,
       timer: null,
       dialogImageUrl: "",
       dialogVisible: false,
-      PageSize: 10,
-      AllTotal: 0,
-      currentPage: 1,
       title: "站点管理",
-      listExtend: [], // 站点管理的返回数据
       siteTypeList: [], //弹框里面站点类型列表
-      searchStr: "",
-      file: [],
-      startDate: "",
-      endDate: "",
-      pickerOptionsStart: {
-        //结束时间不能大于开始时间
-        disabledDate: time => {
-          if (this.endDate) {
-            return time.getTime() > new Date(this.endDate).getTime();
-          }
-        }
-      },
-      pickerOptionsEnd: {
-        disabledDate: time => {
-          return time.getTime() < new Date(this.startDate).getTime();
-        }
-      },
-      List: [],
-      ledlist: [],
       yzaddflag: false,
       ruleForm: {
         id: "", //站点ID
@@ -431,7 +427,7 @@
       //弹窗相关
       dialogInfo:{
         title: {
-          look: '关联设备列表'
+          look: ''
         },
         width: '60%',
         visible: false,
@@ -441,65 +437,65 @@
           {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: '', //接口地址
+        url: this.nozzle.sysEquipRelatedList, //接口地址
         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: "",
+      //已关联设备表格相关
+      isRelatedDeviceTableInfo: {
+        data: [],
+        query: {
+          sign: ""
+        },
+        selectList: []
+      },
+      //未关联设备表格相关
+      unRelatedDeviceTableInfo: {
+        data: [],
+        query: {
+          sign: "unbound"
+        },
+        selectList: []
+      },
+      //设备关联过滤相关
+      deviceRelatedQuery: {
+        searchStr: "",
+        siteCode: ""
+      }
     };
   },
   mounted() {
-    this.getsyscityList();
-    this.getlistExtend();
+    this.siteTableInfo.refresh = Math.random();
     this.getsityType();
     this.getCurrentUserProject(); //获取当前用户所绑定的项目
   },
+  computed: {
+    //移除按钮是否可点击
+    isCanRemoveDevice() {
+      return this.isRelatedDeviceTableInfo.selectList.length ? false : true;
+    },
+    //添加按钮是否可点击
+    isCanInsertDevice() {
+      return this.unRelatedDeviceTableInfo.selectList.length ? false : true;
+    },
+    ...mapGetters(["allDept", "allRole", "allCity"])
+  },
   watch: {
     "ruleForm.area": {
       handler(newVal, oldVal) {
         if (this.$refs.cascader) {
           let children = this.$refs.cascader.getCheckedNodes();
-          // console.log(children);
           if (
             children.length &&
             children[0].children &&
             children[0].children.length < 1
           ) {
-            // console.log(9999);
             this.$refs.cascader.dropDownVisible = false;
           }
         }
@@ -516,30 +512,18 @@
     "dialogInfo.visible"(val) {
       if(!val) {
         this.deviceTableInfo.data = [];
+        this.deviceRelatedQuery.searchStr = "";
         this.dialogInfo.btLoading = false;
       }
+    },
+    "deviceRelatedQuery.searchStr"(val) {
+      Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+      Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
     }
   },
   methods: {
-    //将空的children置为undefined,避免在没有下一级数据的情况下显示暂无数据
-    removeEmptyChild(arr) {
-      arr.forEach(item => {
-        if (!item.children || item.children.length < 1) {
-          item.children = undefined;
-        } else {
-          this.removeEmptyChild(item.children);
-        }
-      });
-      return arr;
-    },
-    handleChangeSearch() {
-      this.currentPage = 1;
-      this.getlistExtend();
-    },
     //上传头像
     fileChange(file) {
-      // console.log(file.size, file.raw.type);
-      // const isJPG = file.raw.type === "image/jpeg";
       this.loading = true;
       const isLt1M = file.size / 1024 / 1024 < 1;
       if (file.raw.type != "image/jpeg" && file.raw.type != "image/png") {
@@ -559,25 +543,24 @@
       let config = {
         headers: { "Content-Type": "multipart/form-data" }
       };
-      axios
-        .post(this.nozzle.upload, formdata, config)
-        .then(res => {
-          if (res.data.code == 1) {
-            this.loading = false;
-            this.$message({
-              message: "上传图片成功！",
-              type: "success"
-            });
-            this.ruleForm.fileList.push(res.data.data[0]);
-          }
-        })
-        .catch(res => {
+      axios.post(this.nozzle.upload, formdata, config).then(res => {
+        if (res.data.code == 1) {
           this.loading = false;
           this.$message({
-            message: "服务器问题！请重试！",
-            type: "warning"
+            message: "上传图片成功！",
+            type: "success"
           });
+          this.ruleForm.fileList.push(res.data.data[0]);
+          this.siteTableInfo.refresh = Math.random();
+        }
+      })
+      .catch(res => {
+        this.loading = false;
+        this.$message({
+          message: "服务器问题！请重试！",
+          type: "warning"
         });
+      });
     },
     // 删除图片按钮
     deleteImg(fileNo) {
@@ -633,39 +616,24 @@
       this.dialogImageUrl = file.fileCloudStorageKey;
       this.dialogVisible = true;
     },
-    // 获取站点列表
-    async getlistExtend() {
-      const { data } = await this.$http.post(this.nozzle.listExtend, {
-        current: this.currentPage,
-        data: {
-          searchStr: this.searchStr,
-          startDate: this.startDate,
-          endDate: this.endDate
-        },
-        size: this.PageSize
-      });
-      this.listExtend = data.data.list;
-      this.AllTotal = data.data.total;
-    },
-    // 搜索查询按钮
-    search() {
-      this.currentPage = 1;
-      this.getlistExtend();
-    },
-    deleteRow(index, rows) {
-      rows.splice(index, 1);
-    },
     // 弹框提交表单按钮
     saveOru(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
-          this.$http
-            .post(this.nozzle.saveOrupdate, {
-              data: this.ruleForm
-            })
-            .then(res => {
+          this.$http.post(this.nozzle.saveOrupdate, {
+            data: this.ruleForm
+          })
+          .then(res => {
+            if(res.data.code === 1) {
+              this.siteTableInfo.refresh = Math.random();
               this.yzaddflag = false;
-            });
+            }
+            this.$message({
+              message: res.data.msg,
+              type: res.data.code === 1 ? 'success' : 'error',
+              showClose: true,
+            })
+          });
         }
       });
     },
@@ -674,7 +642,6 @@
       this.yzaddflag = false;
       this.$refs[formName].resetFields();
     },
-
     visiblechange(visible) {
       if (visible) {
         this.timer = setInterval(() => {
@@ -690,34 +657,6 @@
         clearInterval(this.timer);
       }
     },
-    // 添加站点
-    addform(formName) {
-      this.yzaddflag = true;
-      // 获取地区列表
-      this.title = "新增站点";
-    },
-    // 操作里面的修改弹窗
-    EditFZ(index, rows) {
-      // 获取地区列表
-      for (let key in rows) {
-        if (key === "stationType") {
-          rows[key] = rows[key].toString();
-        }
-        this.ruleForm[key] = rows[key];
-      }
-      this.yzaddflag = true;
-      this.title = "修改站点";
-      this.FenZuflag2type = 2;
-      this.AddFZInput = rows.groupName;
-      this.ClickID = rows.id;
-    },
-    // 获取地区列表数据
-    async getsyscityList() {
-      const { data } = await this.$http.post(this.nozzle.syscity);
-
-      let arr = this.removeEmptyChild(data.data);
-      this.syscityList = data.data;
-    },
     //获取站点类型列表
     async getsityType() {
       const { data } = await this.$http.post(this.nozzle.sityType, {
@@ -745,43 +684,98 @@
         }
       })
     },
+    //表格checkbox选择事件
+    handleEvent(event, data) {
+      switch (event) {
+        case "isRelated":
+          this.isRelatedDeviceTableInfo.selectList = data;
+          break;
+        case "unRelated":
+          this.unRelatedDeviceTableInfo.selectList = data;
+          break;
+      }
+    },
     //点击事件
     handleClick(event, data, index){
       switch(event) {
+        //站点搜索
+        case "search":
+          this.siteTableInfo.initCurpage = Math.random();
+          this.siteTableInfo.refresh = Math.random();
+          break;
+        //添加站点
+        case "create":
+          this.yzaddflag = true;
+          this.title = "新增站点";
+          this.syscityList = this.removeEmptyChild(this.allCity);
+          break;
+        //编辑站点
+        case "update":
+          this.title = "修改站点";
+          for (let key in data) {
+            if (key === "stationType") {
+              data[key] = data[key].toString();
+            }
+            this.ruleForm[key] = data[key];
+          }
+          this.syscityList = this.removeEmptyChild(this.allCity);
+          this.yzaddflag = true;
+          break;
         //查看关联设备
         case "look":
-          this.dialogInfo.visible = true;
           this.dialogInfo.type = event;
-          this.deviceTableInfo.data = data.equips;
-          this.needHandleSiteCode = data.stCode;
+          this.deviceRelatedQuery.siteCode = data.stCode;
+          this.dialogInfo.visible = true;
+          setTimeout(() => {
+            Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+            Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+            this.deviceTableInfo.refresh = Math.random();
+          }, 0);
+          break;
+        //关联设备搜索
+        case "deviceSearch":
+          this.deviceTableInfo.initCurpage = Math.random();
+          this.deviceTableInfo.refresh = Math.random();
+          break;
+        //添加设备到站点
+        case "insert":
+          const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map( item => item.equipNo);
+          const insertData = {
+            siteCode: this.unRelatedDeviceTableInfo.query.siteCode,
+            equipNos: insertEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipInsertBatch, { data: insertData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              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
+            });
+          });
           break;
         //解绑设备与站点
         case "remove":
-          this.$confirm("此操作将解除设备和站点的绑定关系, 是否继续?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(res =>{
-            const params = {
-              data: {
-                siteCode: this.needHandleSiteCode,
-                equipNos: [data.equipNo]
-              }
+          const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(item => item.equipNo);
+          const removeData = {
+            siteCode: this.isRelatedDeviceTableInfo.query.siteCode,
+            equipNos: removeEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipRemoveBatch, { data: removeData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              this.deviceTableInfo.refresh = Math.random();
+              this.deviceTableInfo.initCurpage = Math.random();
             }
-            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(() =>{})
+            this.$message({
+              message: res.data.msg,
+              type: res.data.code === 1 ? "success" : "error",
+              showClose: true
+            });
+          }).catch(e =>{console.log(e)});
           break;
         //关闭
         case "close":
@@ -820,19 +814,21 @@
       };
       this.$refs.cascader.$refs.panel.activePath = [];
       this.$refs.cascader.$refs.panel.clearCheckedNodes();
-      // this.getlistExtend();
     },
     handleChange(value) {
       // 取选中数组的最后一项的id
       this.ruleForm.area = value.slice(-1)[0];
     },
-    handleSizeChange(val) {
-      this.PageSize = val;
-      this.getlistExtend();
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getlistExtend();
+    //将空的children置为undefined,避免在没有下一级数据的情况下显示暂无数据
+    removeEmptyChild(arr) {
+      arr.forEach(item => {
+        if (!item.children || item.children.length < 1) {
+          item.children = undefined;
+        } else {
+          this.removeEmptyChild(item.children);
+        }
+      });
+      return arr;
     }
   },
   destroyed() {
@@ -841,15 +837,10 @@
 };
 </script>
 <style lang="scss" scoped>
-/deep/ .el-pagination .el-pager li.active {
-  background-color: #409eff !important;
-  cursor: default;
-}
 .imgtype {
   width: 150px;
   height: 100px;
 }
-
 /deep/ .el-upload-list {
   display: none;
 }
@@ -858,7 +849,6 @@
   margin: 0 20px 20px 0;
   position: relative;
 }
-
 .deleteSpan {
   position: absolute;
   display: inline-block;
@@ -893,26 +883,33 @@
   width: 200px;
   margin: 0 10px;
 }
-
-.title {
-  height: 50px;
-  line-height: 50px;
+.title, .table-title{
+  @include hl(30px,30px);
+  color: #409EFF;
   text-align: center;
   font-size: 16px;
+  margin-bottom: 10px;
 }
-
 .tableSection {
   padding: 10px;
   background: rgba(270, 255, 255, 0.05);
 }
 /deep/ .el-dialog .el-dialog__body {
   text-align: left;
+  padding-bottom: 0;
 }
-
 .el-dialog .selectInput {
   width: 30% !important;
 }
 .el-dialog .selectInput .el-select-dropdown__empty {
   width: 100% !important;
 }
+.btn-group {
+  height: 100%;
+  @include fdaj(center, center);
+  /deep/ .el-button + .el-button {
+    margin-left: 0;
+    margin-top: 10px;
+  }
+}
 </style>
diff --git a/src/components/ConfigManager/device.vue b/src/components/ConfigManager/device.vue
index f800811..bc4ccda 100644
--- a/src/components/ConfigManager/device.vue
+++ b/src/components/ConfigManager/device.vue
@@ -35,22 +35,97 @@
     </div>
     <!--弹窗-->
     <page-dialog
+      class="page-data-dialog"
       :title="dialogInfo.title[dialogInfo.type]"
       :visible.sync="dialogInfo.visible"
-      :width="dialogInfo.width"
+      :width="dialogInfo.type === 'relate' ? '80%' : '500px'"
       :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"
-      />
+      <!--关联因子-->
+      <template v-if="dialogInfo.type === 'relate'">
+        <div class="page-filter">
+          <el-form :inline="true" :model="factorQuery" ref="factorQuery" size="medium">
+            <el-form-item label="">
+              <el-input v-model="factorQuery.searchStr" placeholder="因子名称/ASCII码" clearable></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="medium" @click="handleClick('factorSearch')">查询</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="page-content">
+          <el-row :gutter="20" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">未关联因子列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="unRelated"
+                :api-url="factorTableInfo.url"
+                :refresh="factorTableInfo.refresh"
+                :data.sync="unRelatedFactorTableInfo.data"
+                :query="unRelatedFactorTableInfo.query"
+                :init-curpage="factorTableInfo.initCurpage"
+                :field-list="factorTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+            <el-col :span="4" class="h-100">
+              <div class="btn-group">
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-right"
+                  :disabled="isCanInsertFactor"
+                  @click="handleClick('insert')"
+                  >添加</el-button
+                >
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-left"
+                  :disabled="isCanRemoveFactor"
+                  @click="handleClick('remove')"
+                  >移除</el-button
+                >
+              </div>
+            </el-col>
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">已关联因子列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="isRelated"
+                :api-url="factorTableInfo.url"
+                :refresh="factorTableInfo.refresh"
+                :data.sync="isRelatedFactorTableInfo.data"
+                :query="isRelatedFactorTableInfo.query"
+                :init-curpage="factorTableInfo.initCurpage"
+                :field-list="factorTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+          </el-row>
+        </div>
+      </template>
+      <!--新增/修改表单-->
+      <template v-else>
+        <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"
+        />
+      </template>
     </page-dialog>
   </div>
 </template>
@@ -80,8 +155,8 @@
           {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"}
+          {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "search", show: true},
+          {type: "button", label: "添加设备", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-3-1"}
         ]
       },
       //设备表格相关
@@ -89,9 +164,7 @@
         url: this.nozzle.sysEquipList, //接口地址
         refresh: 1,
         initCurpage: 1,
-        data: [
-          {equipNo:1000,equipDesc:"3333",equipFactory:'4444'}
-        ],
+        data: [],
         fieldList: [
           { label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
           { label: "设备描述", value: "equipDesc", minWidth: 150, tooltip: true },
@@ -105,8 +178,9 @@
         handle: {
           fixed: "right",
           label: "操作",
-          width: "120",
+          width: "180",
           btList: [
+            { label: "关联因子", size: "small", type: "text", event: "relate", show: true, has: 'm11-3-4' },
             { 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' }
           ]
@@ -143,18 +217,60 @@
       //弹窗相关
       dialogInfo:{
         title: {
-          update: '编辑设备',
-          create: '添加设备'
+          update: "编辑设备",
+          create: "添加设备",
+          relate: "",
         },
-        width: '500px',
+        width: "500px",
         visible: false,
         btLoading: false,
-        type: '',
+        type: "",
         btList: [
-          {label:'关闭',type:'',icon:'',event:'close',show:true},
-          {label:'保存',type:'primary',icon:'',event:'save',show:true,loading:true}
+          {label:"关闭",type:"",icon:"",event:"close",show:true},
+          {label:"保存",type:"primary",icon:"",event:"save",show:true,loading:true}
         ]
       },
+      //因子表格通用相关
+      factorTableInfo: {
+        url: this.nozzle.sysEquipFactorList, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        fieldList: [
+          { label: "因子名称", value: "codeProperty", minWidth: 100, tooltip: true },
+          { label: "因子ASCII码", value: "codeAscll", minWidth: 100, tooltip: true },
+        ]
+      },
+      //已关联因子表格相关
+      isRelatedFactorTableInfo: {
+        data: [],
+        query: {
+          sign: ""
+        },
+        selectList: []
+      },
+      //未关联因子表格相关
+      unRelatedFactorTableInfo: {
+        data: [],
+        query: {
+          sign: "unbound"
+        },
+        selectList: []
+      },
+      //设备关联过滤相关
+      factorQuery: {
+        searchStr: "",
+        equipNo: ""
+      }
+    }
+  },
+  computed: {
+    //移除按钮是否可点击
+    isCanRemoveFactor() {
+      return this.isRelatedFactorTableInfo.selectList.length ? false : true;
+    },
+    //添加按钮是否可点击
+    isCanInsertFactor() {
+      return this.unRelatedFactorTableInfo.selectList.length ? false : true;
     }
   },
   watch: {
@@ -165,8 +281,20 @@
         }
         this.resetForm();
         this.btnLoading = false;
+        this.factorQuery.searchStr = "";
       }
     },
+    "dialogInfo.type"(val) {
+      this.dialogInfo.btList.forEach(item =>{
+        if(item.event === "save") {
+          item.show = val === "relate" ? false : true;
+        }
+      })
+    },
+    "factorQuery.searchStr"(val) {
+      Object.assign(this.isRelatedFactorTableInfo.query, this.factorQuery);
+      Object.assign(this.unRelatedFactorTableInfo.query, this.factorQuery);
+    }
   },
   created() {
     this.initSiteData();
@@ -198,6 +326,17 @@
         }
       })
     },
+    //表格checkbox选择事件
+    handleEvent(event, data) {
+      switch (event) {
+        case "isRelated":
+          this.isRelatedFactorTableInfo.selectList = data;
+          break;
+        case "unRelated":
+          this.unRelatedFactorTableInfo.selectList = data;
+          break;
+      }
+    },
     //点击事件
     handleClick(event, data) {
       switch (event) {
@@ -243,6 +382,62 @@
             })
           }).catch(() =>{})
           break;
+        //查看关联因子
+        case "relate":
+          this.dialogInfo.type = event;
+          this.factorQuery.equipNo = data.equipNo;
+          this.dialogInfo.visible = true;
+          setTimeout(() => {
+            Object.assign(this.isRelatedFactorTableInfo.query, this.factorQuery);
+            Object.assign(this.unRelatedFactorTableInfo.query, this.factorQuery);
+            this.factorTableInfo.refresh = Math.random();
+          }, 0);
+          break;
+        //关联因子搜索
+        case "factorSearch":
+          this.factorTableInfo.initCurpage = Math.random();
+          this.factorTableInfo.refresh = Math.random();
+          break;
+        //添加因子到站点
+        case "insert":
+          const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map( item => item.equipNo);
+          const insertData = {
+            siteCode: this.unRelatedDeviceTableInfo.query.siteCode,
+            equipNos: insertEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipInsertBatch, { data: insertData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              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
+            });
+          });
+          break;
+        //解绑因子与站点
+        case "remove":
+          const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(item => item.equipNo);
+          const removeData = {
+            siteCode: this.isRelatedDeviceTableInfo.query.siteCode,
+            equipNos: removeEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipRemoveBatch, { data: removeData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              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 =>{console.log(e)});
+          break;
         //关闭
         case "close":
           setTimeout(() => {
@@ -294,4 +489,22 @@
     },
   }
 }
-</script>
\ No newline at end of file
+</script>
+
+<style lang="scss" scoped>
+.table-title{
+  @include hl(30px,30px);
+  color: #409EFF;
+  text-align: center;
+  font-size: 16px;
+  margin-bottom: 10px;
+}
+.btn-group {
+  height: 100%;
+  @include fdaj(center, center);
+  /deep/ .el-button + .el-button {
+    margin-left: 0;
+    margin-top: 10px;
+  }
+}
+</style>
\ No newline at end of file

diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index b4e4a8f..440a79e 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -78,6 +78,15 @@
   background: transparent;
 }
 /****页面通用样式****/
+.flex{
+  display: flex;
+}
+.flex-1{
+  flex: 1;
+}
+.flex-d{
+  flex-direction: column;
+}
 .page-data {
   display: flex;
   flex-direction: column;
@@ -108,10 +117,10 @@
   flex-direction: column;
   flex: 1;
   padding: 20px;
+  padding-bottom: 0 !important;
   overflow-y: auto;
 }
 .page-data-dialog .el-pagination__sizes,
-.page-data-dialog .el-pagination__total,
 .page-data-dialog .el-pagination__jump{
-  display: none;
+  display: none !important;
 }
\ No newline at end of file
diff --git a/src/assets/css/mixin.css b/src/assets/css/mixin.css
deleted file mode 100644
index 9e97d02..0000000
--- a/src/assets/css/mixin.css
+++ /dev/null
@@ -1 +0,0 @@
-/* No CSS *//*# sourceMappingURL=mixin.css.map */
\ No newline at end of file
diff --git a/src/assets/css/mixin.css.map b/src/assets/css/mixin.css.map
deleted file mode 100644
index 356f200..0000000
--- a/src/assets/css/mixin.css.map
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "version": 3,
-    "mappings": "",
-    "sources": [
-        "mixin.scss"
-    ],
-    "names": [],
-    "file": "mixin.css"
-}
\ No newline at end of file
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 219a678..281044c 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -1,107 +1,37 @@
 <template>
-  <div id="pagetwo">
-    <div class="form">
-      <el-input
-        v-model="searchStr"
-        placeholder="请输入站点编号或站点名称"
-        clearable
-        @change="handleChangeSearch"
-      ></el-input>
-      <el-date-picker
-        v-model="startDate"
-        value-format="yyyy-MM-dd"
-        :picker-options="pickerOptionsStart"
-        type="date"
-        :clearable="true"
-        placeholder="请选择开始日期"
+  <div id="pagetwo" class="page-data">
+    <!--搜素框-->
+    <div class="page-filter">
+      <page-filter
+        :query.sync="siteFilterInfo.query"
+        :filter-list="siteFilterInfo.list"
+        @handleClick="handleClick"
       />
-      <el-date-picker
-        v-model="endDate"
-        value-format="yyyy-MM-dd"
-        :picker-options="pickerOptionsEnd"
-        type="date"
-        :clearable="true"
-        placeholder="请选择结束日期"
-      />
-      <el-button
-        type="primary"
-        icon="el-icon-search"
-        @click="search"
-        v-has="'Search'"
-        >查询</el-button
-      >
-      <el-button
-        type="primary"
-        icon="el-icon-circle-plus-outline"
-        @click="addform('ruleForm')"
-        v-has="'m11-2-1'"
-        >添加站点</el-button
-      >
     </div>
-
-    <el-table :data="listExtend" style="width: 100%; height: calc(100% - 82px)">
-      <el-table-column
-        type="index"
-        label="序号"
-        width="70"
-      ></el-table-column>
-      <el-table-column
-        prop="stCode"
-        label="站点编号"
-        max-width="120"
-        show-overflow-tooltip
-      ></el-table-column>
-      <el-table-column
-        prop="stName"
-        label="站点名称"
-        show-overflow-tooltip
-        max-width="150"
-      ></el-table-column>
-      <el-table-column label="站点类型" width="120">
-        <template slot-scope="scope">
-          <div>
-            <span v-if="scope.row.stationType == 0">水质站</span>
-            <span v-if="scope.row.stationType == 1">水位站</span>
-            <span v-if="scope.row.stationType == 2">流量站</span>
-          </div>
-        </template></el-table-column
-      >
-      <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"
-            size="small"
-            @click="EditFZ(scope.$index, scope.row)"
-            style="margin: 0 10px"
-            v-has="'m11-2-2'"
-            >修改</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
+    <div class="page-content">
+      <!--表格-->
+      <div class="h-100">
+        <page-table
+          tabIndex
+          pagination
+          :api-url="siteTableInfo.url"
+          :refresh="siteTableInfo.refresh"
+          :data.sync="siteTableInfo.data"
+          :query="siteFilterInfo.query"
+          :page-query="siteTableInfo.pageQuery"
+          :list-type-info="listTypeInfo"
+          :init-curpage="siteTableInfo.initCurpage"
+          :field-list="siteTableInfo.fieldList"
+          :handle="siteTableInfo.handle"
+          @handleClick="handleClick"
+        >
+          <!-- 自定义插槽显示状态 -->
+          <template v-slot:col-equips="scope">
+            <el-button type="text" size="small" @click="handleClick('look',scope.row)">查看设备</el-button>
+          </template>
+        </page-table>
+      </div>
+    </div>
 
     <!-- 新增/修改的弹出框 -->
     <el-dialog
@@ -266,72 +196,138 @@
       class="page-data-dialog"
       :title="dialogInfo.title[dialogInfo.type]"
       :visible.sync="dialogInfo.visible"
-      :width="dialogInfo.width"
+      width="80%"
       :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"
-      />
+      <template v-if="dialogInfo.type === 'look'">
+        <div class="page-filter">
+          <el-form :inline="true" :model="deviceRelatedQuery" ref="deviceRelatedQuery" size="medium">
+            <el-form-item label="">
+              <el-input v-model="deviceRelatedQuery.searchStr" placeholder="请输入设备编号/厂家" clearable></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="medium" @click="handleClick('deviceSearch')">查询</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="page-content">
+          <el-row :gutter="20" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">未关联设备列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="unRelated"
+                :api-url="deviceTableInfo.url"
+                :refresh="deviceTableInfo.refresh"
+                :data.sync="unRelatedDeviceTableInfo.data"
+                :query="unRelatedDeviceTableInfo.query"
+                :init-curpage="deviceTableInfo.initCurpage"
+                :field-list="deviceTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+            <el-col :span="4" class="h-100">
+              <div class="btn-group">
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-right"
+                  :disabled="isCanInsertDevice"
+                  @click="handleClick('insert')"
+                  >添加</el-button
+                >
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-left"
+                  :disabled="isCanRemoveDevice"
+                  @click="handleClick('remove')"
+                  >移除</el-button
+                >
+              </div>
+            </el-col>
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">已关联设备列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="isRelated"
+                :api-url="deviceTableInfo.url"
+                :refresh="deviceTableInfo.refresh"
+                :data.sync="isRelatedDeviceTableInfo.data"
+                :query="isRelatedDeviceTableInfo.query"
+                :init-curpage="deviceTableInfo.initCurpage"
+                :field-list="deviceTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+          </el-row>
+        </div>
+      </template>
     </page-dialog>
-    <el-pagination
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page="currentPage"
-      :page-sizes="[10, 20, 30, 40]"
-      :page-size="PageSize"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="AllTotal"
-    >
-    </el-pagination>
   </div>
 </template>
 <script>
 import axios from "axios";
-
+import { mapGetters } from "vuex";
 export default {
-  name: "StatisticalReport",
   data() {
     return {
+      //站点搜索相关
+      siteFilterInfo: {
+        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: "el-icon-search", event: "search", show: true},
+          {type: "button", label: "添加站点", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-2-1"}
+        ]
+      },
+      //站点表格相关
+      siteTableInfo: {
+        url: this.nozzle.listExtend, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [],
+        fieldList: [
+          { label: "站点编号", value: "stCode", minWidth: 120, tooltip: true },
+          { label: "站点名称", value: "stName", minWidth: 120, tooltip: true },
+          { label: "站点类型", value: "stationTypeName", width: 120 },
+          { label: "站点安装时间", value: "createTime", minWidth: 120, tooltip: true },
+          { label: "安装人", value: "person", width: 120 },
+          { label: "关联设备", value: "equips", width: 100, type: "slot" },
+          { label: "首次数据接入时间", value: "tt", minWidth: 120, tooltip: true },
+        ],
+        handle: {
+          fixed: "right",
+          label: "操作",
+          width: "80",
+          btList: [
+            { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-2-2' }
+          ]
+        }
+      },
+      //列表相关
+      listTypeInfo: {},
       loadingdelet: undefined,
       loading: false,
       timer: null,
       dialogImageUrl: "",
       dialogVisible: false,
-      PageSize: 10,
-      AllTotal: 0,
-      currentPage: 1,
       title: "站点管理",
-      listExtend: [], // 站点管理的返回数据
       siteTypeList: [], //弹框里面站点类型列表
-      searchStr: "",
-      file: [],
-      startDate: "",
-      endDate: "",
-      pickerOptionsStart: {
-        //结束时间不能大于开始时间
-        disabledDate: time => {
-          if (this.endDate) {
-            return time.getTime() > new Date(this.endDate).getTime();
-          }
-        }
-      },
-      pickerOptionsEnd: {
-        disabledDate: time => {
-          return time.getTime() < new Date(this.startDate).getTime();
-        }
-      },
-      List: [],
-      ledlist: [],
       yzaddflag: false,
       ruleForm: {
         id: "", //站点ID
@@ -431,7 +427,7 @@
       //弹窗相关
       dialogInfo:{
         title: {
-          look: '关联设备列表'
+          look: ''
         },
         width: '60%',
         visible: false,
@@ -441,65 +437,65 @@
           {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: '', //接口地址
+        url: this.nozzle.sysEquipRelatedList, //接口地址
         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: "",
+      //已关联设备表格相关
+      isRelatedDeviceTableInfo: {
+        data: [],
+        query: {
+          sign: ""
+        },
+        selectList: []
+      },
+      //未关联设备表格相关
+      unRelatedDeviceTableInfo: {
+        data: [],
+        query: {
+          sign: "unbound"
+        },
+        selectList: []
+      },
+      //设备关联过滤相关
+      deviceRelatedQuery: {
+        searchStr: "",
+        siteCode: ""
+      }
     };
   },
   mounted() {
-    this.getsyscityList();
-    this.getlistExtend();
+    this.siteTableInfo.refresh = Math.random();
     this.getsityType();
     this.getCurrentUserProject(); //获取当前用户所绑定的项目
   },
+  computed: {
+    //移除按钮是否可点击
+    isCanRemoveDevice() {
+      return this.isRelatedDeviceTableInfo.selectList.length ? false : true;
+    },
+    //添加按钮是否可点击
+    isCanInsertDevice() {
+      return this.unRelatedDeviceTableInfo.selectList.length ? false : true;
+    },
+    ...mapGetters(["allDept", "allRole", "allCity"])
+  },
   watch: {
     "ruleForm.area": {
       handler(newVal, oldVal) {
         if (this.$refs.cascader) {
           let children = this.$refs.cascader.getCheckedNodes();
-          // console.log(children);
           if (
             children.length &&
             children[0].children &&
             children[0].children.length < 1
           ) {
-            // console.log(9999);
             this.$refs.cascader.dropDownVisible = false;
           }
         }
@@ -516,30 +512,18 @@
     "dialogInfo.visible"(val) {
       if(!val) {
         this.deviceTableInfo.data = [];
+        this.deviceRelatedQuery.searchStr = "";
         this.dialogInfo.btLoading = false;
       }
+    },
+    "deviceRelatedQuery.searchStr"(val) {
+      Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+      Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
     }
   },
   methods: {
-    //将空的children置为undefined,避免在没有下一级数据的情况下显示暂无数据
-    removeEmptyChild(arr) {
-      arr.forEach(item => {
-        if (!item.children || item.children.length < 1) {
-          item.children = undefined;
-        } else {
-          this.removeEmptyChild(item.children);
-        }
-      });
-      return arr;
-    },
-    handleChangeSearch() {
-      this.currentPage = 1;
-      this.getlistExtend();
-    },
     //上传头像
     fileChange(file) {
-      // console.log(file.size, file.raw.type);
-      // const isJPG = file.raw.type === "image/jpeg";
       this.loading = true;
       const isLt1M = file.size / 1024 / 1024 < 1;
       if (file.raw.type != "image/jpeg" && file.raw.type != "image/png") {
@@ -559,25 +543,24 @@
       let config = {
         headers: { "Content-Type": "multipart/form-data" }
       };
-      axios
-        .post(this.nozzle.upload, formdata, config)
-        .then(res => {
-          if (res.data.code == 1) {
-            this.loading = false;
-            this.$message({
-              message: "上传图片成功！",
-              type: "success"
-            });
-            this.ruleForm.fileList.push(res.data.data[0]);
-          }
-        })
-        .catch(res => {
+      axios.post(this.nozzle.upload, formdata, config).then(res => {
+        if (res.data.code == 1) {
           this.loading = false;
           this.$message({
-            message: "服务器问题！请重试！",
-            type: "warning"
+            message: "上传图片成功！",
+            type: "success"
           });
+          this.ruleForm.fileList.push(res.data.data[0]);
+          this.siteTableInfo.refresh = Math.random();
+        }
+      })
+      .catch(res => {
+        this.loading = false;
+        this.$message({
+          message: "服务器问题！请重试！",
+          type: "warning"
         });
+      });
     },
     // 删除图片按钮
     deleteImg(fileNo) {
@@ -633,39 +616,24 @@
       this.dialogImageUrl = file.fileCloudStorageKey;
       this.dialogVisible = true;
     },
-    // 获取站点列表
-    async getlistExtend() {
-      const { data } = await this.$http.post(this.nozzle.listExtend, {
-        current: this.currentPage,
-        data: {
-          searchStr: this.searchStr,
-          startDate: this.startDate,
-          endDate: this.endDate
-        },
-        size: this.PageSize
-      });
-      this.listExtend = data.data.list;
-      this.AllTotal = data.data.total;
-    },
-    // 搜索查询按钮
-    search() {
-      this.currentPage = 1;
-      this.getlistExtend();
-    },
-    deleteRow(index, rows) {
-      rows.splice(index, 1);
-    },
     // 弹框提交表单按钮
     saveOru(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
-          this.$http
-            .post(this.nozzle.saveOrupdate, {
-              data: this.ruleForm
-            })
-            .then(res => {
+          this.$http.post(this.nozzle.saveOrupdate, {
+            data: this.ruleForm
+          })
+          .then(res => {
+            if(res.data.code === 1) {
+              this.siteTableInfo.refresh = Math.random();
               this.yzaddflag = false;
-            });
+            }
+            this.$message({
+              message: res.data.msg,
+              type: res.data.code === 1 ? 'success' : 'error',
+              showClose: true,
+            })
+          });
         }
       });
     },
@@ -674,7 +642,6 @@
       this.yzaddflag = false;
       this.$refs[formName].resetFields();
     },
-
     visiblechange(visible) {
       if (visible) {
         this.timer = setInterval(() => {
@@ -690,34 +657,6 @@
         clearInterval(this.timer);
       }
     },
-    // 添加站点
-    addform(formName) {
-      this.yzaddflag = true;
-      // 获取地区列表
-      this.title = "新增站点";
-    },
-    // 操作里面的修改弹窗
-    EditFZ(index, rows) {
-      // 获取地区列表
-      for (let key in rows) {
-        if (key === "stationType") {
-          rows[key] = rows[key].toString();
-        }
-        this.ruleForm[key] = rows[key];
-      }
-      this.yzaddflag = true;
-      this.title = "修改站点";
-      this.FenZuflag2type = 2;
-      this.AddFZInput = rows.groupName;
-      this.ClickID = rows.id;
-    },
-    // 获取地区列表数据
-    async getsyscityList() {
-      const { data } = await this.$http.post(this.nozzle.syscity);
-
-      let arr = this.removeEmptyChild(data.data);
-      this.syscityList = data.data;
-    },
     //获取站点类型列表
     async getsityType() {
       const { data } = await this.$http.post(this.nozzle.sityType, {
@@ -745,43 +684,98 @@
         }
       })
     },
+    //表格checkbox选择事件
+    handleEvent(event, data) {
+      switch (event) {
+        case "isRelated":
+          this.isRelatedDeviceTableInfo.selectList = data;
+          break;
+        case "unRelated":
+          this.unRelatedDeviceTableInfo.selectList = data;
+          break;
+      }
+    },
     //点击事件
     handleClick(event, data, index){
       switch(event) {
+        //站点搜索
+        case "search":
+          this.siteTableInfo.initCurpage = Math.random();
+          this.siteTableInfo.refresh = Math.random();
+          break;
+        //添加站点
+        case "create":
+          this.yzaddflag = true;
+          this.title = "新增站点";
+          this.syscityList = this.removeEmptyChild(this.allCity);
+          break;
+        //编辑站点
+        case "update":
+          this.title = "修改站点";
+          for (let key in data) {
+            if (key === "stationType") {
+              data[key] = data[key].toString();
+            }
+            this.ruleForm[key] = data[key];
+          }
+          this.syscityList = this.removeEmptyChild(this.allCity);
+          this.yzaddflag = true;
+          break;
         //查看关联设备
         case "look":
-          this.dialogInfo.visible = true;
           this.dialogInfo.type = event;
-          this.deviceTableInfo.data = data.equips;
-          this.needHandleSiteCode = data.stCode;
+          this.deviceRelatedQuery.siteCode = data.stCode;
+          this.dialogInfo.visible = true;
+          setTimeout(() => {
+            Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+            Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+            this.deviceTableInfo.refresh = Math.random();
+          }, 0);
+          break;
+        //关联设备搜索
+        case "deviceSearch":
+          this.deviceTableInfo.initCurpage = Math.random();
+          this.deviceTableInfo.refresh = Math.random();
+          break;
+        //添加设备到站点
+        case "insert":
+          const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map( item => item.equipNo);
+          const insertData = {
+            siteCode: this.unRelatedDeviceTableInfo.query.siteCode,
+            equipNos: insertEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipInsertBatch, { data: insertData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              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
+            });
+          });
           break;
         //解绑设备与站点
         case "remove":
-          this.$confirm("此操作将解除设备和站点的绑定关系, 是否继续?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(res =>{
-            const params = {
-              data: {
-                siteCode: this.needHandleSiteCode,
-                equipNos: [data.equipNo]
-              }
+          const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(item => item.equipNo);
+          const removeData = {
+            siteCode: this.isRelatedDeviceTableInfo.query.siteCode,
+            equipNos: removeEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipRemoveBatch, { data: removeData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              this.deviceTableInfo.refresh = Math.random();
+              this.deviceTableInfo.initCurpage = Math.random();
             }
-            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(() =>{})
+            this.$message({
+              message: res.data.msg,
+              type: res.data.code === 1 ? "success" : "error",
+              showClose: true
+            });
+          }).catch(e =>{console.log(e)});
           break;
         //关闭
         case "close":
@@ -820,19 +814,21 @@
       };
       this.$refs.cascader.$refs.panel.activePath = [];
       this.$refs.cascader.$refs.panel.clearCheckedNodes();
-      // this.getlistExtend();
     },
     handleChange(value) {
       // 取选中数组的最后一项的id
       this.ruleForm.area = value.slice(-1)[0];
     },
-    handleSizeChange(val) {
-      this.PageSize = val;
-      this.getlistExtend();
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getlistExtend();
+    //将空的children置为undefined,避免在没有下一级数据的情况下显示暂无数据
+    removeEmptyChild(arr) {
+      arr.forEach(item => {
+        if (!item.children || item.children.length < 1) {
+          item.children = undefined;
+        } else {
+          this.removeEmptyChild(item.children);
+        }
+      });
+      return arr;
     }
   },
   destroyed() {
@@ -841,15 +837,10 @@
 };
 </script>
 <style lang="scss" scoped>
-/deep/ .el-pagination .el-pager li.active {
-  background-color: #409eff !important;
-  cursor: default;
-}
 .imgtype {
   width: 150px;
   height: 100px;
 }
-
 /deep/ .el-upload-list {
   display: none;
 }
@@ -858,7 +849,6 @@
   margin: 0 20px 20px 0;
   position: relative;
 }
-
 .deleteSpan {
   position: absolute;
   display: inline-block;
@@ -893,26 +883,33 @@
   width: 200px;
   margin: 0 10px;
 }
-
-.title {
-  height: 50px;
-  line-height: 50px;
+.title, .table-title{
+  @include hl(30px,30px);
+  color: #409EFF;
   text-align: center;
   font-size: 16px;
+  margin-bottom: 10px;
 }
-
 .tableSection {
   padding: 10px;
   background: rgba(270, 255, 255, 0.05);
 }
 /deep/ .el-dialog .el-dialog__body {
   text-align: left;
+  padding-bottom: 0;
 }
-
 .el-dialog .selectInput {
   width: 30% !important;
 }
 .el-dialog .selectInput .el-select-dropdown__empty {
   width: 100% !important;
 }
+.btn-group {
+  height: 100%;
+  @include fdaj(center, center);
+  /deep/ .el-button + .el-button {
+    margin-left: 0;
+    margin-top: 10px;
+  }
+}
 </style>
diff --git a/src/components/ConfigManager/device.vue b/src/components/ConfigManager/device.vue
index f800811..bc4ccda 100644
--- a/src/components/ConfigManager/device.vue
+++ b/src/components/ConfigManager/device.vue
@@ -35,22 +35,97 @@
     </div>
     <!--弹窗-->
     <page-dialog
+      class="page-data-dialog"
       :title="dialogInfo.title[dialogInfo.type]"
       :visible.sync="dialogInfo.visible"
-      :width="dialogInfo.width"
+      :width="dialogInfo.type === 'relate' ? '80%' : '500px'"
       :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"
-      />
+      <!--关联因子-->
+      <template v-if="dialogInfo.type === 'relate'">
+        <div class="page-filter">
+          <el-form :inline="true" :model="factorQuery" ref="factorQuery" size="medium">
+            <el-form-item label="">
+              <el-input v-model="factorQuery.searchStr" placeholder="因子名称/ASCII码" clearable></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="medium" @click="handleClick('factorSearch')">查询</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="page-content">
+          <el-row :gutter="20" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">未关联因子列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="unRelated"
+                :api-url="factorTableInfo.url"
+                :refresh="factorTableInfo.refresh"
+                :data.sync="unRelatedFactorTableInfo.data"
+                :query="unRelatedFactorTableInfo.query"
+                :init-curpage="factorTableInfo.initCurpage"
+                :field-list="factorTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+            <el-col :span="4" class="h-100">
+              <div class="btn-group">
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-right"
+                  :disabled="isCanInsertFactor"
+                  @click="handleClick('insert')"
+                  >添加</el-button
+                >
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-left"
+                  :disabled="isCanRemoveFactor"
+                  @click="handleClick('remove')"
+                  >移除</el-button
+                >
+              </div>
+            </el-col>
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">已关联因子列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="isRelated"
+                :api-url="factorTableInfo.url"
+                :refresh="factorTableInfo.refresh"
+                :data.sync="isRelatedFactorTableInfo.data"
+                :query="isRelatedFactorTableInfo.query"
+                :init-curpage="factorTableInfo.initCurpage"
+                :field-list="factorTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+          </el-row>
+        </div>
+      </template>
+      <!--新增/修改表单-->
+      <template v-else>
+        <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"
+        />
+      </template>
     </page-dialog>
   </div>
 </template>
@@ -80,8 +155,8 @@
           {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"}
+          {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "search", show: true},
+          {type: "button", label: "添加设备", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-3-1"}
         ]
       },
       //设备表格相关
@@ -89,9 +164,7 @@
         url: this.nozzle.sysEquipList, //接口地址
         refresh: 1,
         initCurpage: 1,
-        data: [
-          {equipNo:1000,equipDesc:"3333",equipFactory:'4444'}
-        ],
+        data: [],
         fieldList: [
           { label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
           { label: "设备描述", value: "equipDesc", minWidth: 150, tooltip: true },
@@ -105,8 +178,9 @@
         handle: {
           fixed: "right",
           label: "操作",
-          width: "120",
+          width: "180",
           btList: [
+            { label: "关联因子", size: "small", type: "text", event: "relate", show: true, has: 'm11-3-4' },
             { 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' }
           ]
@@ -143,18 +217,60 @@
       //弹窗相关
       dialogInfo:{
         title: {
-          update: '编辑设备',
-          create: '添加设备'
+          update: "编辑设备",
+          create: "添加设备",
+          relate: "",
         },
-        width: '500px',
+        width: "500px",
         visible: false,
         btLoading: false,
-        type: '',
+        type: "",
         btList: [
-          {label:'关闭',type:'',icon:'',event:'close',show:true},
-          {label:'保存',type:'primary',icon:'',event:'save',show:true,loading:true}
+          {label:"关闭",type:"",icon:"",event:"close",show:true},
+          {label:"保存",type:"primary",icon:"",event:"save",show:true,loading:true}
         ]
       },
+      //因子表格通用相关
+      factorTableInfo: {
+        url: this.nozzle.sysEquipFactorList, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        fieldList: [
+          { label: "因子名称", value: "codeProperty", minWidth: 100, tooltip: true },
+          { label: "因子ASCII码", value: "codeAscll", minWidth: 100, tooltip: true },
+        ]
+      },
+      //已关联因子表格相关
+      isRelatedFactorTableInfo: {
+        data: [],
+        query: {
+          sign: ""
+        },
+        selectList: []
+      },
+      //未关联因子表格相关
+      unRelatedFactorTableInfo: {
+        data: [],
+        query: {
+          sign: "unbound"
+        },
+        selectList: []
+      },
+      //设备关联过滤相关
+      factorQuery: {
+        searchStr: "",
+        equipNo: ""
+      }
+    }
+  },
+  computed: {
+    //移除按钮是否可点击
+    isCanRemoveFactor() {
+      return this.isRelatedFactorTableInfo.selectList.length ? false : true;
+    },
+    //添加按钮是否可点击
+    isCanInsertFactor() {
+      return this.unRelatedFactorTableInfo.selectList.length ? false : true;
     }
   },
   watch: {
@@ -165,8 +281,20 @@
         }
         this.resetForm();
         this.btnLoading = false;
+        this.factorQuery.searchStr = "";
       }
     },
+    "dialogInfo.type"(val) {
+      this.dialogInfo.btList.forEach(item =>{
+        if(item.event === "save") {
+          item.show = val === "relate" ? false : true;
+        }
+      })
+    },
+    "factorQuery.searchStr"(val) {
+      Object.assign(this.isRelatedFactorTableInfo.query, this.factorQuery);
+      Object.assign(this.unRelatedFactorTableInfo.query, this.factorQuery);
+    }
   },
   created() {
     this.initSiteData();
@@ -198,6 +326,17 @@
         }
       })
     },
+    //表格checkbox选择事件
+    handleEvent(event, data) {
+      switch (event) {
+        case "isRelated":
+          this.isRelatedFactorTableInfo.selectList = data;
+          break;
+        case "unRelated":
+          this.unRelatedFactorTableInfo.selectList = data;
+          break;
+      }
+    },
     //点击事件
     handleClick(event, data) {
       switch (event) {
@@ -243,6 +382,62 @@
             })
           }).catch(() =>{})
           break;
+        //查看关联因子
+        case "relate":
+          this.dialogInfo.type = event;
+          this.factorQuery.equipNo = data.equipNo;
+          this.dialogInfo.visible = true;
+          setTimeout(() => {
+            Object.assign(this.isRelatedFactorTableInfo.query, this.factorQuery);
+            Object.assign(this.unRelatedFactorTableInfo.query, this.factorQuery);
+            this.factorTableInfo.refresh = Math.random();
+          }, 0);
+          break;
+        //关联因子搜索
+        case "factorSearch":
+          this.factorTableInfo.initCurpage = Math.random();
+          this.factorTableInfo.refresh = Math.random();
+          break;
+        //添加因子到站点
+        case "insert":
+          const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map( item => item.equipNo);
+          const insertData = {
+            siteCode: this.unRelatedDeviceTableInfo.query.siteCode,
+            equipNos: insertEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipInsertBatch, { data: insertData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              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
+            });
+          });
+          break;
+        //解绑因子与站点
+        case "remove":
+          const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(item => item.equipNo);
+          const removeData = {
+            siteCode: this.isRelatedDeviceTableInfo.query.siteCode,
+            equipNos: removeEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipRemoveBatch, { data: removeData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              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 =>{console.log(e)});
+          break;
         //关闭
         case "close":
           setTimeout(() => {
@@ -294,4 +489,22 @@
     },
   }
 }
-</script>
\ No newline at end of file
+</script>
+
+<style lang="scss" scoped>
+.table-title{
+  @include hl(30px,30px);
+  color: #409EFF;
+  text-align: center;
+  font-size: 16px;
+  margin-bottom: 10px;
+}
+.btn-group {
+  height: 100%;
+  @include fdaj(center, center);
+  /deep/ .el-button + .el-button {
+    margin-left: 0;
+    margin-top: 10px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/ConfigManager/factor.vue b/src/components/ConfigManager/factor.vue
new file mode 100644
index 0000000..f38f0b9
--- /dev/null
+++ b/src/components/ConfigManager/factor.vue
@@ -0,0 +1,79 @@
+<template>
+  <div class="page-data">
+    <!--搜素框-->
+    <div class="page-filter">
+      <page-filter
+        :query.sync="factorFilterInfo.query"
+        :filter-list="factorFilterInfo.list"
+        @handleClick="handleClick"
+      />
+    </div>
+    <div class="page-content">
+      <!--表格-->
+      <div class="h-100">
+        <page-table
+          tabIndex
+          pagination
+          :api-url="factorTableInfo.url"
+          :refresh="factorTableInfo.refresh"
+          :data.sync="factorTableInfo.data"
+          :query="factorFilterInfo.query"
+          :page-query="factorTableInfo.pageQuery"
+          :init-curpage="factorTableInfo.initCurpage"
+          :field-list="factorTableInfo.fieldList"
+          @handleClick="handleClick"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { message } from "./../../util/item";
+export default {
+  data() {
+    return {
+      //因子搜索相关
+      factorFilterInfo: {
+        query: {
+          searchStr: "",
+        },
+        list: [
+          {type: "input", label: "因子名称/ASCII码", value: "searchStr", hideLabel: true },
+          {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "search", show: true},
+        ]
+      },
+      //因子表格相关
+      factorTableInfo: {
+        url: this.nozzle.sysEquipConfigList, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [],
+        fieldList: [
+          { label: "因子名称", value: "codeProperty", minWidth: 150, tooltip: true },
+          { label: "因子ASCII码", value: "codeAscll", minWidth: 100, tooltip: true },
+          { label: "水文编号", value: "code", minWidth: 100, tooltip: true },
+          { label: "因子最大值", value: "maxValue", minWidth: 100, tooltip: true },
+          { label: "因子最小值", value: "minValue", minWidth: 100, tooltip: true },
+          { label: "因子单位", value: "unit", minWidth: 100, tooltip: true },
+        ]
+      }
+    }
+  },
+  mounted() {
+    this.factorTableInfo.refresh = Math.random();
+  },
+  methods: {
+    //点击事件
+    handleClick(event, data) {
+      switch (event) {
+        //设备搜索
+        case "search":
+          this.factorTableInfo.initCurpage = Math.random();
+          this.factorTableInfo.refresh = Math.random();
+          break;
+      }
+    }
+  }
+}
+</script>
\ No newline at end of file

diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index b4e4a8f..440a79e 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -78,6 +78,15 @@
   background: transparent;
 }
 /****页面通用样式****/
+.flex{
+  display: flex;
+}
+.flex-1{
+  flex: 1;
+}
+.flex-d{
+  flex-direction: column;
+}
 .page-data {
   display: flex;
   flex-direction: column;
@@ -108,10 +117,10 @@
   flex-direction: column;
   flex: 1;
   padding: 20px;
+  padding-bottom: 0 !important;
   overflow-y: auto;
 }
 .page-data-dialog .el-pagination__sizes,
-.page-data-dialog .el-pagination__total,
 .page-data-dialog .el-pagination__jump{
-  display: none;
+  display: none !important;
 }
\ No newline at end of file
diff --git a/src/assets/css/mixin.css b/src/assets/css/mixin.css
deleted file mode 100644
index 9e97d02..0000000
--- a/src/assets/css/mixin.css
+++ /dev/null
@@ -1 +0,0 @@
-/* No CSS *//*# sourceMappingURL=mixin.css.map */
\ No newline at end of file
diff --git a/src/assets/css/mixin.css.map b/src/assets/css/mixin.css.map
deleted file mode 100644
index 356f200..0000000
--- a/src/assets/css/mixin.css.map
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "version": 3,
-    "mappings": "",
-    "sources": [
-        "mixin.scss"
-    ],
-    "names": [],
-    "file": "mixin.css"
-}
\ No newline at end of file
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 219a678..281044c 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -1,107 +1,37 @@
 <template>
-  <div id="pagetwo">
-    <div class="form">
-      <el-input
-        v-model="searchStr"
-        placeholder="请输入站点编号或站点名称"
-        clearable
-        @change="handleChangeSearch"
-      ></el-input>
-      <el-date-picker
-        v-model="startDate"
-        value-format="yyyy-MM-dd"
-        :picker-options="pickerOptionsStart"
-        type="date"
-        :clearable="true"
-        placeholder="请选择开始日期"
+  <div id="pagetwo" class="page-data">
+    <!--搜素框-->
+    <div class="page-filter">
+      <page-filter
+        :query.sync="siteFilterInfo.query"
+        :filter-list="siteFilterInfo.list"
+        @handleClick="handleClick"
       />
-      <el-date-picker
-        v-model="endDate"
-        value-format="yyyy-MM-dd"
-        :picker-options="pickerOptionsEnd"
-        type="date"
-        :clearable="true"
-        placeholder="请选择结束日期"
-      />
-      <el-button
-        type="primary"
-        icon="el-icon-search"
-        @click="search"
-        v-has="'Search'"
-        >查询</el-button
-      >
-      <el-button
-        type="primary"
-        icon="el-icon-circle-plus-outline"
-        @click="addform('ruleForm')"
-        v-has="'m11-2-1'"
-        >添加站点</el-button
-      >
     </div>
-
-    <el-table :data="listExtend" style="width: 100%; height: calc(100% - 82px)">
-      <el-table-column
-        type="index"
-        label="序号"
-        width="70"
-      ></el-table-column>
-      <el-table-column
-        prop="stCode"
-        label="站点编号"
-        max-width="120"
-        show-overflow-tooltip
-      ></el-table-column>
-      <el-table-column
-        prop="stName"
-        label="站点名称"
-        show-overflow-tooltip
-        max-width="150"
-      ></el-table-column>
-      <el-table-column label="站点类型" width="120">
-        <template slot-scope="scope">
-          <div>
-            <span v-if="scope.row.stationType == 0">水质站</span>
-            <span v-if="scope.row.stationType == 1">水位站</span>
-            <span v-if="scope.row.stationType == 2">流量站</span>
-          </div>
-        </template></el-table-column
-      >
-      <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"
-            size="small"
-            @click="EditFZ(scope.$index, scope.row)"
-            style="margin: 0 10px"
-            v-has="'m11-2-2'"
-            >修改</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
+    <div class="page-content">
+      <!--表格-->
+      <div class="h-100">
+        <page-table
+          tabIndex
+          pagination
+          :api-url="siteTableInfo.url"
+          :refresh="siteTableInfo.refresh"
+          :data.sync="siteTableInfo.data"
+          :query="siteFilterInfo.query"
+          :page-query="siteTableInfo.pageQuery"
+          :list-type-info="listTypeInfo"
+          :init-curpage="siteTableInfo.initCurpage"
+          :field-list="siteTableInfo.fieldList"
+          :handle="siteTableInfo.handle"
+          @handleClick="handleClick"
+        >
+          <!-- 自定义插槽显示状态 -->
+          <template v-slot:col-equips="scope">
+            <el-button type="text" size="small" @click="handleClick('look',scope.row)">查看设备</el-button>
+          </template>
+        </page-table>
+      </div>
+    </div>
 
     <!-- 新增/修改的弹出框 -->
     <el-dialog
@@ -266,72 +196,138 @@
       class="page-data-dialog"
       :title="dialogInfo.title[dialogInfo.type]"
       :visible.sync="dialogInfo.visible"
-      :width="dialogInfo.width"
+      width="80%"
       :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"
-      />
+      <template v-if="dialogInfo.type === 'look'">
+        <div class="page-filter">
+          <el-form :inline="true" :model="deviceRelatedQuery" ref="deviceRelatedQuery" size="medium">
+            <el-form-item label="">
+              <el-input v-model="deviceRelatedQuery.searchStr" placeholder="请输入设备编号/厂家" clearable></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="medium" @click="handleClick('deviceSearch')">查询</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="page-content">
+          <el-row :gutter="20" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">未关联设备列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="unRelated"
+                :api-url="deviceTableInfo.url"
+                :refresh="deviceTableInfo.refresh"
+                :data.sync="unRelatedDeviceTableInfo.data"
+                :query="unRelatedDeviceTableInfo.query"
+                :init-curpage="deviceTableInfo.initCurpage"
+                :field-list="deviceTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+            <el-col :span="4" class="h-100">
+              <div class="btn-group">
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-right"
+                  :disabled="isCanInsertDevice"
+                  @click="handleClick('insert')"
+                  >添加</el-button
+                >
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-left"
+                  :disabled="isCanRemoveDevice"
+                  @click="handleClick('remove')"
+                  >移除</el-button
+                >
+              </div>
+            </el-col>
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">已关联设备列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="isRelated"
+                :api-url="deviceTableInfo.url"
+                :refresh="deviceTableInfo.refresh"
+                :data.sync="isRelatedDeviceTableInfo.data"
+                :query="isRelatedDeviceTableInfo.query"
+                :init-curpage="deviceTableInfo.initCurpage"
+                :field-list="deviceTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+          </el-row>
+        </div>
+      </template>
     </page-dialog>
-    <el-pagination
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page="currentPage"
-      :page-sizes="[10, 20, 30, 40]"
-      :page-size="PageSize"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="AllTotal"
-    >
-    </el-pagination>
   </div>
 </template>
 <script>
 import axios from "axios";
-
+import { mapGetters } from "vuex";
 export default {
-  name: "StatisticalReport",
   data() {
     return {
+      //站点搜索相关
+      siteFilterInfo: {
+        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: "el-icon-search", event: "search", show: true},
+          {type: "button", label: "添加站点", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-2-1"}
+        ]
+      },
+      //站点表格相关
+      siteTableInfo: {
+        url: this.nozzle.listExtend, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [],
+        fieldList: [
+          { label: "站点编号", value: "stCode", minWidth: 120, tooltip: true },
+          { label: "站点名称", value: "stName", minWidth: 120, tooltip: true },
+          { label: "站点类型", value: "stationTypeName", width: 120 },
+          { label: "站点安装时间", value: "createTime", minWidth: 120, tooltip: true },
+          { label: "安装人", value: "person", width: 120 },
+          { label: "关联设备", value: "equips", width: 100, type: "slot" },
+          { label: "首次数据接入时间", value: "tt", minWidth: 120, tooltip: true },
+        ],
+        handle: {
+          fixed: "right",
+          label: "操作",
+          width: "80",
+          btList: [
+            { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-2-2' }
+          ]
+        }
+      },
+      //列表相关
+      listTypeInfo: {},
       loadingdelet: undefined,
       loading: false,
       timer: null,
       dialogImageUrl: "",
       dialogVisible: false,
-      PageSize: 10,
-      AllTotal: 0,
-      currentPage: 1,
       title: "站点管理",
-      listExtend: [], // 站点管理的返回数据
       siteTypeList: [], //弹框里面站点类型列表
-      searchStr: "",
-      file: [],
-      startDate: "",
-      endDate: "",
-      pickerOptionsStart: {
-        //结束时间不能大于开始时间
-        disabledDate: time => {
-          if (this.endDate) {
-            return time.getTime() > new Date(this.endDate).getTime();
-          }
-        }
-      },
-      pickerOptionsEnd: {
-        disabledDate: time => {
-          return time.getTime() < new Date(this.startDate).getTime();
-        }
-      },
-      List: [],
-      ledlist: [],
       yzaddflag: false,
       ruleForm: {
         id: "", //站点ID
@@ -431,7 +427,7 @@
       //弹窗相关
       dialogInfo:{
         title: {
-          look: '关联设备列表'
+          look: ''
         },
         width: '60%',
         visible: false,
@@ -441,65 +437,65 @@
           {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: '', //接口地址
+        url: this.nozzle.sysEquipRelatedList, //接口地址
         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: "",
+      //已关联设备表格相关
+      isRelatedDeviceTableInfo: {
+        data: [],
+        query: {
+          sign: ""
+        },
+        selectList: []
+      },
+      //未关联设备表格相关
+      unRelatedDeviceTableInfo: {
+        data: [],
+        query: {
+          sign: "unbound"
+        },
+        selectList: []
+      },
+      //设备关联过滤相关
+      deviceRelatedQuery: {
+        searchStr: "",
+        siteCode: ""
+      }
     };
   },
   mounted() {
-    this.getsyscityList();
-    this.getlistExtend();
+    this.siteTableInfo.refresh = Math.random();
     this.getsityType();
     this.getCurrentUserProject(); //获取当前用户所绑定的项目
   },
+  computed: {
+    //移除按钮是否可点击
+    isCanRemoveDevice() {
+      return this.isRelatedDeviceTableInfo.selectList.length ? false : true;
+    },
+    //添加按钮是否可点击
+    isCanInsertDevice() {
+      return this.unRelatedDeviceTableInfo.selectList.length ? false : true;
+    },
+    ...mapGetters(["allDept", "allRole", "allCity"])
+  },
   watch: {
     "ruleForm.area": {
       handler(newVal, oldVal) {
         if (this.$refs.cascader) {
           let children = this.$refs.cascader.getCheckedNodes();
-          // console.log(children);
           if (
             children.length &&
             children[0].children &&
             children[0].children.length < 1
           ) {
-            // console.log(9999);
             this.$refs.cascader.dropDownVisible = false;
           }
         }
@@ -516,30 +512,18 @@
     "dialogInfo.visible"(val) {
       if(!val) {
         this.deviceTableInfo.data = [];
+        this.deviceRelatedQuery.searchStr = "";
         this.dialogInfo.btLoading = false;
       }
+    },
+    "deviceRelatedQuery.searchStr"(val) {
+      Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+      Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
     }
   },
   methods: {
-    //将空的children置为undefined,避免在没有下一级数据的情况下显示暂无数据
-    removeEmptyChild(arr) {
-      arr.forEach(item => {
-        if (!item.children || item.children.length < 1) {
-          item.children = undefined;
-        } else {
-          this.removeEmptyChild(item.children);
-        }
-      });
-      return arr;
-    },
-    handleChangeSearch() {
-      this.currentPage = 1;
-      this.getlistExtend();
-    },
     //上传头像
     fileChange(file) {
-      // console.log(file.size, file.raw.type);
-      // const isJPG = file.raw.type === "image/jpeg";
       this.loading = true;
       const isLt1M = file.size / 1024 / 1024 < 1;
       if (file.raw.type != "image/jpeg" && file.raw.type != "image/png") {
@@ -559,25 +543,24 @@
       let config = {
         headers: { "Content-Type": "multipart/form-data" }
       };
-      axios
-        .post(this.nozzle.upload, formdata, config)
-        .then(res => {
-          if (res.data.code == 1) {
-            this.loading = false;
-            this.$message({
-              message: "上传图片成功！",
-              type: "success"
-            });
-            this.ruleForm.fileList.push(res.data.data[0]);
-          }
-        })
-        .catch(res => {
+      axios.post(this.nozzle.upload, formdata, config).then(res => {
+        if (res.data.code == 1) {
           this.loading = false;
           this.$message({
-            message: "服务器问题！请重试！",
-            type: "warning"
+            message: "上传图片成功！",
+            type: "success"
           });
+          this.ruleForm.fileList.push(res.data.data[0]);
+          this.siteTableInfo.refresh = Math.random();
+        }
+      })
+      .catch(res => {
+        this.loading = false;
+        this.$message({
+          message: "服务器问题！请重试！",
+          type: "warning"
         });
+      });
     },
     // 删除图片按钮
     deleteImg(fileNo) {
@@ -633,39 +616,24 @@
       this.dialogImageUrl = file.fileCloudStorageKey;
       this.dialogVisible = true;
     },
-    // 获取站点列表
-    async getlistExtend() {
-      const { data } = await this.$http.post(this.nozzle.listExtend, {
-        current: this.currentPage,
-        data: {
-          searchStr: this.searchStr,
-          startDate: this.startDate,
-          endDate: this.endDate
-        },
-        size: this.PageSize
-      });
-      this.listExtend = data.data.list;
-      this.AllTotal = data.data.total;
-    },
-    // 搜索查询按钮
-    search() {
-      this.currentPage = 1;
-      this.getlistExtend();
-    },
-    deleteRow(index, rows) {
-      rows.splice(index, 1);
-    },
     // 弹框提交表单按钮
     saveOru(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
-          this.$http
-            .post(this.nozzle.saveOrupdate, {
-              data: this.ruleForm
-            })
-            .then(res => {
+          this.$http.post(this.nozzle.saveOrupdate, {
+            data: this.ruleForm
+          })
+          .then(res => {
+            if(res.data.code === 1) {
+              this.siteTableInfo.refresh = Math.random();
               this.yzaddflag = false;
-            });
+            }
+            this.$message({
+              message: res.data.msg,
+              type: res.data.code === 1 ? 'success' : 'error',
+              showClose: true,
+            })
+          });
         }
       });
     },
@@ -674,7 +642,6 @@
       this.yzaddflag = false;
       this.$refs[formName].resetFields();
     },
-
     visiblechange(visible) {
       if (visible) {
         this.timer = setInterval(() => {
@@ -690,34 +657,6 @@
         clearInterval(this.timer);
       }
     },
-    // 添加站点
-    addform(formName) {
-      this.yzaddflag = true;
-      // 获取地区列表
-      this.title = "新增站点";
-    },
-    // 操作里面的修改弹窗
-    EditFZ(index, rows) {
-      // 获取地区列表
-      for (let key in rows) {
-        if (key === "stationType") {
-          rows[key] = rows[key].toString();
-        }
-        this.ruleForm[key] = rows[key];
-      }
-      this.yzaddflag = true;
-      this.title = "修改站点";
-      this.FenZuflag2type = 2;
-      this.AddFZInput = rows.groupName;
-      this.ClickID = rows.id;
-    },
-    // 获取地区列表数据
-    async getsyscityList() {
-      const { data } = await this.$http.post(this.nozzle.syscity);
-
-      let arr = this.removeEmptyChild(data.data);
-      this.syscityList = data.data;
-    },
     //获取站点类型列表
     async getsityType() {
       const { data } = await this.$http.post(this.nozzle.sityType, {
@@ -745,43 +684,98 @@
         }
       })
     },
+    //表格checkbox选择事件
+    handleEvent(event, data) {
+      switch (event) {
+        case "isRelated":
+          this.isRelatedDeviceTableInfo.selectList = data;
+          break;
+        case "unRelated":
+          this.unRelatedDeviceTableInfo.selectList = data;
+          break;
+      }
+    },
     //点击事件
     handleClick(event, data, index){
       switch(event) {
+        //站点搜索
+        case "search":
+          this.siteTableInfo.initCurpage = Math.random();
+          this.siteTableInfo.refresh = Math.random();
+          break;
+        //添加站点
+        case "create":
+          this.yzaddflag = true;
+          this.title = "新增站点";
+          this.syscityList = this.removeEmptyChild(this.allCity);
+          break;
+        //编辑站点
+        case "update":
+          this.title = "修改站点";
+          for (let key in data) {
+            if (key === "stationType") {
+              data[key] = data[key].toString();
+            }
+            this.ruleForm[key] = data[key];
+          }
+          this.syscityList = this.removeEmptyChild(this.allCity);
+          this.yzaddflag = true;
+          break;
         //查看关联设备
         case "look":
-          this.dialogInfo.visible = true;
           this.dialogInfo.type = event;
-          this.deviceTableInfo.data = data.equips;
-          this.needHandleSiteCode = data.stCode;
+          this.deviceRelatedQuery.siteCode = data.stCode;
+          this.dialogInfo.visible = true;
+          setTimeout(() => {
+            Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+            Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+            this.deviceTableInfo.refresh = Math.random();
+          }, 0);
+          break;
+        //关联设备搜索
+        case "deviceSearch":
+          this.deviceTableInfo.initCurpage = Math.random();
+          this.deviceTableInfo.refresh = Math.random();
+          break;
+        //添加设备到站点
+        case "insert":
+          const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map( item => item.equipNo);
+          const insertData = {
+            siteCode: this.unRelatedDeviceTableInfo.query.siteCode,
+            equipNos: insertEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipInsertBatch, { data: insertData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              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
+            });
+          });
           break;
         //解绑设备与站点
         case "remove":
-          this.$confirm("此操作将解除设备和站点的绑定关系, 是否继续?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(res =>{
-            const params = {
-              data: {
-                siteCode: this.needHandleSiteCode,
-                equipNos: [data.equipNo]
-              }
+          const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(item => item.equipNo);
+          const removeData = {
+            siteCode: this.isRelatedDeviceTableInfo.query.siteCode,
+            equipNos: removeEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipRemoveBatch, { data: removeData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              this.deviceTableInfo.refresh = Math.random();
+              this.deviceTableInfo.initCurpage = Math.random();
             }
-            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(() =>{})
+            this.$message({
+              message: res.data.msg,
+              type: res.data.code === 1 ? "success" : "error",
+              showClose: true
+            });
+          }).catch(e =>{console.log(e)});
           break;
         //关闭
         case "close":
@@ -820,19 +814,21 @@
       };
       this.$refs.cascader.$refs.panel.activePath = [];
       this.$refs.cascader.$refs.panel.clearCheckedNodes();
-      // this.getlistExtend();
     },
     handleChange(value) {
       // 取选中数组的最后一项的id
       this.ruleForm.area = value.slice(-1)[0];
     },
-    handleSizeChange(val) {
-      this.PageSize = val;
-      this.getlistExtend();
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getlistExtend();
+    //将空的children置为undefined,避免在没有下一级数据的情况下显示暂无数据
+    removeEmptyChild(arr) {
+      arr.forEach(item => {
+        if (!item.children || item.children.length < 1) {
+          item.children = undefined;
+        } else {
+          this.removeEmptyChild(item.children);
+        }
+      });
+      return arr;
     }
   },
   destroyed() {
@@ -841,15 +837,10 @@
 };
 </script>
 <style lang="scss" scoped>
-/deep/ .el-pagination .el-pager li.active {
-  background-color: #409eff !important;
-  cursor: default;
-}
 .imgtype {
   width: 150px;
   height: 100px;
 }
-
 /deep/ .el-upload-list {
   display: none;
 }
@@ -858,7 +849,6 @@
   margin: 0 20px 20px 0;
   position: relative;
 }
-
 .deleteSpan {
   position: absolute;
   display: inline-block;
@@ -893,26 +883,33 @@
   width: 200px;
   margin: 0 10px;
 }
-
-.title {
-  height: 50px;
-  line-height: 50px;
+.title, .table-title{
+  @include hl(30px,30px);
+  color: #409EFF;
   text-align: center;
   font-size: 16px;
+  margin-bottom: 10px;
 }
-
 .tableSection {
   padding: 10px;
   background: rgba(270, 255, 255, 0.05);
 }
 /deep/ .el-dialog .el-dialog__body {
   text-align: left;
+  padding-bottom: 0;
 }
-
 .el-dialog .selectInput {
   width: 30% !important;
 }
 .el-dialog .selectInput .el-select-dropdown__empty {
   width: 100% !important;
 }
+.btn-group {
+  height: 100%;
+  @include fdaj(center, center);
+  /deep/ .el-button + .el-button {
+    margin-left: 0;
+    margin-top: 10px;
+  }
+}
 </style>
diff --git a/src/components/ConfigManager/device.vue b/src/components/ConfigManager/device.vue
index f800811..bc4ccda 100644
--- a/src/components/ConfigManager/device.vue
+++ b/src/components/ConfigManager/device.vue
@@ -35,22 +35,97 @@
     </div>
     <!--弹窗-->
     <page-dialog
+      class="page-data-dialog"
       :title="dialogInfo.title[dialogInfo.type]"
       :visible.sync="dialogInfo.visible"
-      :width="dialogInfo.width"
+      :width="dialogInfo.type === 'relate' ? '80%' : '500px'"
       :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"
-      />
+      <!--关联因子-->
+      <template v-if="dialogInfo.type === 'relate'">
+        <div class="page-filter">
+          <el-form :inline="true" :model="factorQuery" ref="factorQuery" size="medium">
+            <el-form-item label="">
+              <el-input v-model="factorQuery.searchStr" placeholder="因子名称/ASCII码" clearable></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="medium" @click="handleClick('factorSearch')">查询</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="page-content">
+          <el-row :gutter="20" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">未关联因子列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="unRelated"
+                :api-url="factorTableInfo.url"
+                :refresh="factorTableInfo.refresh"
+                :data.sync="unRelatedFactorTableInfo.data"
+                :query="unRelatedFactorTableInfo.query"
+                :init-curpage="factorTableInfo.initCurpage"
+                :field-list="factorTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+            <el-col :span="4" class="h-100">
+              <div class="btn-group">
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-right"
+                  :disabled="isCanInsertFactor"
+                  @click="handleClick('insert')"
+                  >添加</el-button
+                >
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-left"
+                  :disabled="isCanRemoveFactor"
+                  @click="handleClick('remove')"
+                  >移除</el-button
+                >
+              </div>
+            </el-col>
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">已关联因子列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="isRelated"
+                :api-url="factorTableInfo.url"
+                :refresh="factorTableInfo.refresh"
+                :data.sync="isRelatedFactorTableInfo.data"
+                :query="isRelatedFactorTableInfo.query"
+                :init-curpage="factorTableInfo.initCurpage"
+                :field-list="factorTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+          </el-row>
+        </div>
+      </template>
+      <!--新增/修改表单-->
+      <template v-else>
+        <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"
+        />
+      </template>
     </page-dialog>
   </div>
 </template>
@@ -80,8 +155,8 @@
           {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"}
+          {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "search", show: true},
+          {type: "button", label: "添加设备", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-3-1"}
         ]
       },
       //设备表格相关
@@ -89,9 +164,7 @@
         url: this.nozzle.sysEquipList, //接口地址
         refresh: 1,
         initCurpage: 1,
-        data: [
-          {equipNo:1000,equipDesc:"3333",equipFactory:'4444'}
-        ],
+        data: [],
         fieldList: [
           { label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
           { label: "设备描述", value: "equipDesc", minWidth: 150, tooltip: true },
@@ -105,8 +178,9 @@
         handle: {
           fixed: "right",
           label: "操作",
-          width: "120",
+          width: "180",
           btList: [
+            { label: "关联因子", size: "small", type: "text", event: "relate", show: true, has: 'm11-3-4' },
             { 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' }
           ]
@@ -143,18 +217,60 @@
       //弹窗相关
       dialogInfo:{
         title: {
-          update: '编辑设备',
-          create: '添加设备'
+          update: "编辑设备",
+          create: "添加设备",
+          relate: "",
         },
-        width: '500px',
+        width: "500px",
         visible: false,
         btLoading: false,
-        type: '',
+        type: "",
         btList: [
-          {label:'关闭',type:'',icon:'',event:'close',show:true},
-          {label:'保存',type:'primary',icon:'',event:'save',show:true,loading:true}
+          {label:"关闭",type:"",icon:"",event:"close",show:true},
+          {label:"保存",type:"primary",icon:"",event:"save",show:true,loading:true}
         ]
       },
+      //因子表格通用相关
+      factorTableInfo: {
+        url: this.nozzle.sysEquipFactorList, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        fieldList: [
+          { label: "因子名称", value: "codeProperty", minWidth: 100, tooltip: true },
+          { label: "因子ASCII码", value: "codeAscll", minWidth: 100, tooltip: true },
+        ]
+      },
+      //已关联因子表格相关
+      isRelatedFactorTableInfo: {
+        data: [],
+        query: {
+          sign: ""
+        },
+        selectList: []
+      },
+      //未关联因子表格相关
+      unRelatedFactorTableInfo: {
+        data: [],
+        query: {
+          sign: "unbound"
+        },
+        selectList: []
+      },
+      //设备关联过滤相关
+      factorQuery: {
+        searchStr: "",
+        equipNo: ""
+      }
+    }
+  },
+  computed: {
+    //移除按钮是否可点击
+    isCanRemoveFactor() {
+      return this.isRelatedFactorTableInfo.selectList.length ? false : true;
+    },
+    //添加按钮是否可点击
+    isCanInsertFactor() {
+      return this.unRelatedFactorTableInfo.selectList.length ? false : true;
     }
   },
   watch: {
@@ -165,8 +281,20 @@
         }
         this.resetForm();
         this.btnLoading = false;
+        this.factorQuery.searchStr = "";
       }
     },
+    "dialogInfo.type"(val) {
+      this.dialogInfo.btList.forEach(item =>{
+        if(item.event === "save") {
+          item.show = val === "relate" ? false : true;
+        }
+      })
+    },
+    "factorQuery.searchStr"(val) {
+      Object.assign(this.isRelatedFactorTableInfo.query, this.factorQuery);
+      Object.assign(this.unRelatedFactorTableInfo.query, this.factorQuery);
+    }
   },
   created() {
     this.initSiteData();
@@ -198,6 +326,17 @@
         }
       })
     },
+    //表格checkbox选择事件
+    handleEvent(event, data) {
+      switch (event) {
+        case "isRelated":
+          this.isRelatedFactorTableInfo.selectList = data;
+          break;
+        case "unRelated":
+          this.unRelatedFactorTableInfo.selectList = data;
+          break;
+      }
+    },
     //点击事件
     handleClick(event, data) {
       switch (event) {
@@ -243,6 +382,62 @@
             })
           }).catch(() =>{})
           break;
+        //查看关联因子
+        case "relate":
+          this.dialogInfo.type = event;
+          this.factorQuery.equipNo = data.equipNo;
+          this.dialogInfo.visible = true;
+          setTimeout(() => {
+            Object.assign(this.isRelatedFactorTableInfo.query, this.factorQuery);
+            Object.assign(this.unRelatedFactorTableInfo.query, this.factorQuery);
+            this.factorTableInfo.refresh = Math.random();
+          }, 0);
+          break;
+        //关联因子搜索
+        case "factorSearch":
+          this.factorTableInfo.initCurpage = Math.random();
+          this.factorTableInfo.refresh = Math.random();
+          break;
+        //添加因子到站点
+        case "insert":
+          const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map( item => item.equipNo);
+          const insertData = {
+            siteCode: this.unRelatedDeviceTableInfo.query.siteCode,
+            equipNos: insertEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipInsertBatch, { data: insertData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              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
+            });
+          });
+          break;
+        //解绑因子与站点
+        case "remove":
+          const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(item => item.equipNo);
+          const removeData = {
+            siteCode: this.isRelatedDeviceTableInfo.query.siteCode,
+            equipNos: removeEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipRemoveBatch, { data: removeData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              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 =>{console.log(e)});
+          break;
         //关闭
         case "close":
           setTimeout(() => {
@@ -294,4 +489,22 @@
     },
   }
 }
-</script>
\ No newline at end of file
+</script>
+
+<style lang="scss" scoped>
+.table-title{
+  @include hl(30px,30px);
+  color: #409EFF;
+  text-align: center;
+  font-size: 16px;
+  margin-bottom: 10px;
+}
+.btn-group {
+  height: 100%;
+  @include fdaj(center, center);
+  /deep/ .el-button + .el-button {
+    margin-left: 0;
+    margin-top: 10px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/ConfigManager/factor.vue b/src/components/ConfigManager/factor.vue
new file mode 100644
index 0000000..f38f0b9
--- /dev/null
+++ b/src/components/ConfigManager/factor.vue
@@ -0,0 +1,79 @@
+<template>
+  <div class="page-data">
+    <!--搜素框-->
+    <div class="page-filter">
+      <page-filter
+        :query.sync="factorFilterInfo.query"
+        :filter-list="factorFilterInfo.list"
+        @handleClick="handleClick"
+      />
+    </div>
+    <div class="page-content">
+      <!--表格-->
+      <div class="h-100">
+        <page-table
+          tabIndex
+          pagination
+          :api-url="factorTableInfo.url"
+          :refresh="factorTableInfo.refresh"
+          :data.sync="factorTableInfo.data"
+          :query="factorFilterInfo.query"
+          :page-query="factorTableInfo.pageQuery"
+          :init-curpage="factorTableInfo.initCurpage"
+          :field-list="factorTableInfo.fieldList"
+          @handleClick="handleClick"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { message } from "./../../util/item";
+export default {
+  data() {
+    return {
+      //因子搜索相关
+      factorFilterInfo: {
+        query: {
+          searchStr: "",
+        },
+        list: [
+          {type: "input", label: "因子名称/ASCII码", value: "searchStr", hideLabel: true },
+          {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "search", show: true},
+        ]
+      },
+      //因子表格相关
+      factorTableInfo: {
+        url: this.nozzle.sysEquipConfigList, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [],
+        fieldList: [
+          { label: "因子名称", value: "codeProperty", minWidth: 150, tooltip: true },
+          { label: "因子ASCII码", value: "codeAscll", minWidth: 100, tooltip: true },
+          { label: "水文编号", value: "code", minWidth: 100, tooltip: true },
+          { label: "因子最大值", value: "maxValue", minWidth: 100, tooltip: true },
+          { label: "因子最小值", value: "minValue", minWidth: 100, tooltip: true },
+          { label: "因子单位", value: "unit", minWidth: 100, tooltip: true },
+        ]
+      }
+    }
+  },
+  mounted() {
+    this.factorTableInfo.refresh = Math.random();
+  },
+  methods: {
+    //点击事件
+    handleClick(event, data) {
+      switch (event) {
+        //设备搜索
+        case "search":
+          this.factorTableInfo.initCurpage = Math.random();
+          this.factorTableInfo.refresh = Math.random();
+          break;
+      }
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index 065f3da..31253a6 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -35,6 +35,7 @@
     </div>
     <!--弹窗-->
     <el-dialog
+      class="page-data-dialog"
       :width="dialogInfo.width"
       append-to-body
       :title="dialogInfo.title[dialogInfo.type]"
@@ -55,9 +56,10 @@
         </div>
         <div class="page-content">
           <el-row :gutter="20" class="h-100">
-            <el-col :span="10" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">未关联站点列表</div>
               <page-table
-                tabIndex
+                class="flex-1"
                 checkBox
                 pagination
                 type="unRelate"
@@ -91,9 +93,10 @@
                 >
               </div>
             </el-col>
-            <el-col :span="10" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">已关联站点列表</div>
               <page-table
-                tabIndex
+                class="flex-1"
                 checkBox
                 pagination
                 type="isRelate"
@@ -244,8 +247,8 @@
           {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: "searchProject", show: true},
-          {type: "button", label: "添加项目", btType: "primary", icon: "", event: "create", show: true, has: "m11-1-4"}
+          {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "searchProject", show: true},
+          {type: "button", label: "添加项目", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-1-4"}
         ]
       },
       //项目表格相关
@@ -269,7 +272,7 @@
           width: "240",
           btList: [
             { label: "分配权限", size: "small", type: "text", event: "permission", show: true, has: 'm11-1-1' },
-            { label: "项目关联站点", size: "small", type: "text", event: "relate", show: true, has: 'm11-1-2' },
+            { label: "关联站点", size: "small", type: "text", event: "relate", show: true, has: 'm11-1-2' },
             { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-1-3' },
             { label: "删除", size: "small", type: "text", event: "delete", show: true, has: 'm11-1-5' }
           ]
@@ -329,10 +332,9 @@
         xmlxList: [{ key: "合同项目", value: "0" }, { key: "临测项目", value: "1" }],
         groupList: [],
         deptTree: [],
-        roleTree: [],
         userType: [{ key: "普通用户", value: 0 }, { key: "超级管理员", value: 1 }],
         statusList: [{ key: "未管理", value: 0 }, { key: "管理中", value: 1 }],
-        roleList: [{ key: "111", value: 0 }, { key: "2222", value: 1 }],
+        roleList: [],
       },
       //用户弹窗相关
       userDialogInfo: {
@@ -679,7 +681,6 @@
           this.dialogInfo.visible = true;
           this.dialogInfo.type = event;
           this.listTypeInfo.deptTree = this.allDept;
-          this.listTypeInfo.roleTree = this.allRole;
           this.needHandleProjectId = data.platformCode;
           this.permissionFilterInfo.query.platformCode = data.platformCode;
           setTimeout(() => {
@@ -1005,14 +1006,16 @@
   .el-dialog__body {
     @include fd();
     flex: 1;
-    padding: 20px;
+    padding-bottom: 0;
     overflow-y: auto;
   }
-  .el-pagination__sizes,
-  .el-pagination__total,
-  .el-pagination__jump {
-    display: none;
-  }
+}
+.table-title{
+  @include hl(30px,30px);
+  color: #409EFF;
+  text-align: center;
+  font-size: 16px;
+  margin-bottom: 10px;
 }
 .userDialog {
   /deep/ .el-form-item {

diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index b4e4a8f..440a79e 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -78,6 +78,15 @@
   background: transparent;
 }
 /****页面通用样式****/
+.flex{
+  display: flex;
+}
+.flex-1{
+  flex: 1;
+}
+.flex-d{
+  flex-direction: column;
+}
 .page-data {
   display: flex;
   flex-direction: column;
@@ -108,10 +117,10 @@
   flex-direction: column;
   flex: 1;
   padding: 20px;
+  padding-bottom: 0 !important;
   overflow-y: auto;
 }
 .page-data-dialog .el-pagination__sizes,
-.page-data-dialog .el-pagination__total,
 .page-data-dialog .el-pagination__jump{
-  display: none;
+  display: none !important;
 }
\ No newline at end of file
diff --git a/src/assets/css/mixin.css b/src/assets/css/mixin.css
deleted file mode 100644
index 9e97d02..0000000
--- a/src/assets/css/mixin.css
+++ /dev/null
@@ -1 +0,0 @@
-/* No CSS *//*# sourceMappingURL=mixin.css.map */
\ No newline at end of file
diff --git a/src/assets/css/mixin.css.map b/src/assets/css/mixin.css.map
deleted file mode 100644
index 356f200..0000000
--- a/src/assets/css/mixin.css.map
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "version": 3,
-    "mappings": "",
-    "sources": [
-        "mixin.scss"
-    ],
-    "names": [],
-    "file": "mixin.css"
-}
\ No newline at end of file
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 219a678..281044c 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -1,107 +1,37 @@
 <template>
-  <div id="pagetwo">
-    <div class="form">
-      <el-input
-        v-model="searchStr"
-        placeholder="请输入站点编号或站点名称"
-        clearable
-        @change="handleChangeSearch"
-      ></el-input>
-      <el-date-picker
-        v-model="startDate"
-        value-format="yyyy-MM-dd"
-        :picker-options="pickerOptionsStart"
-        type="date"
-        :clearable="true"
-        placeholder="请选择开始日期"
+  <div id="pagetwo" class="page-data">
+    <!--搜素框-->
+    <div class="page-filter">
+      <page-filter
+        :query.sync="siteFilterInfo.query"
+        :filter-list="siteFilterInfo.list"
+        @handleClick="handleClick"
       />
-      <el-date-picker
-        v-model="endDate"
-        value-format="yyyy-MM-dd"
-        :picker-options="pickerOptionsEnd"
-        type="date"
-        :clearable="true"
-        placeholder="请选择结束日期"
-      />
-      <el-button
-        type="primary"
-        icon="el-icon-search"
-        @click="search"
-        v-has="'Search'"
-        >查询</el-button
-      >
-      <el-button
-        type="primary"
-        icon="el-icon-circle-plus-outline"
-        @click="addform('ruleForm')"
-        v-has="'m11-2-1'"
-        >添加站点</el-button
-      >
     </div>
-
-    <el-table :data="listExtend" style="width: 100%; height: calc(100% - 82px)">
-      <el-table-column
-        type="index"
-        label="序号"
-        width="70"
-      ></el-table-column>
-      <el-table-column
-        prop="stCode"
-        label="站点编号"
-        max-width="120"
-        show-overflow-tooltip
-      ></el-table-column>
-      <el-table-column
-        prop="stName"
-        label="站点名称"
-        show-overflow-tooltip
-        max-width="150"
-      ></el-table-column>
-      <el-table-column label="站点类型" width="120">
-        <template slot-scope="scope">
-          <div>
-            <span v-if="scope.row.stationType == 0">水质站</span>
-            <span v-if="scope.row.stationType == 1">水位站</span>
-            <span v-if="scope.row.stationType == 2">流量站</span>
-          </div>
-        </template></el-table-column
-      >
-      <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"
-            size="small"
-            @click="EditFZ(scope.$index, scope.row)"
-            style="margin: 0 10px"
-            v-has="'m11-2-2'"
-            >修改</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
+    <div class="page-content">
+      <!--表格-->
+      <div class="h-100">
+        <page-table
+          tabIndex
+          pagination
+          :api-url="siteTableInfo.url"
+          :refresh="siteTableInfo.refresh"
+          :data.sync="siteTableInfo.data"
+          :query="siteFilterInfo.query"
+          :page-query="siteTableInfo.pageQuery"
+          :list-type-info="listTypeInfo"
+          :init-curpage="siteTableInfo.initCurpage"
+          :field-list="siteTableInfo.fieldList"
+          :handle="siteTableInfo.handle"
+          @handleClick="handleClick"
+        >
+          <!-- 自定义插槽显示状态 -->
+          <template v-slot:col-equips="scope">
+            <el-button type="text" size="small" @click="handleClick('look',scope.row)">查看设备</el-button>
+          </template>
+        </page-table>
+      </div>
+    </div>
 
     <!-- 新增/修改的弹出框 -->
     <el-dialog
@@ -266,72 +196,138 @@
       class="page-data-dialog"
       :title="dialogInfo.title[dialogInfo.type]"
       :visible.sync="dialogInfo.visible"
-      :width="dialogInfo.width"
+      width="80%"
       :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"
-      />
+      <template v-if="dialogInfo.type === 'look'">
+        <div class="page-filter">
+          <el-form :inline="true" :model="deviceRelatedQuery" ref="deviceRelatedQuery" size="medium">
+            <el-form-item label="">
+              <el-input v-model="deviceRelatedQuery.searchStr" placeholder="请输入设备编号/厂家" clearable></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="medium" @click="handleClick('deviceSearch')">查询</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="page-content">
+          <el-row :gutter="20" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">未关联设备列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="unRelated"
+                :api-url="deviceTableInfo.url"
+                :refresh="deviceTableInfo.refresh"
+                :data.sync="unRelatedDeviceTableInfo.data"
+                :query="unRelatedDeviceTableInfo.query"
+                :init-curpage="deviceTableInfo.initCurpage"
+                :field-list="deviceTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+            <el-col :span="4" class="h-100">
+              <div class="btn-group">
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-right"
+                  :disabled="isCanInsertDevice"
+                  @click="handleClick('insert')"
+                  >添加</el-button
+                >
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-left"
+                  :disabled="isCanRemoveDevice"
+                  @click="handleClick('remove')"
+                  >移除</el-button
+                >
+              </div>
+            </el-col>
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">已关联设备列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="isRelated"
+                :api-url="deviceTableInfo.url"
+                :refresh="deviceTableInfo.refresh"
+                :data.sync="isRelatedDeviceTableInfo.data"
+                :query="isRelatedDeviceTableInfo.query"
+                :init-curpage="deviceTableInfo.initCurpage"
+                :field-list="deviceTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+          </el-row>
+        </div>
+      </template>
     </page-dialog>
-    <el-pagination
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page="currentPage"
-      :page-sizes="[10, 20, 30, 40]"
-      :page-size="PageSize"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="AllTotal"
-    >
-    </el-pagination>
   </div>
 </template>
 <script>
 import axios from "axios";
-
+import { mapGetters } from "vuex";
 export default {
-  name: "StatisticalReport",
   data() {
     return {
+      //站点搜索相关
+      siteFilterInfo: {
+        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: "el-icon-search", event: "search", show: true},
+          {type: "button", label: "添加站点", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-2-1"}
+        ]
+      },
+      //站点表格相关
+      siteTableInfo: {
+        url: this.nozzle.listExtend, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [],
+        fieldList: [
+          { label: "站点编号", value: "stCode", minWidth: 120, tooltip: true },
+          { label: "站点名称", value: "stName", minWidth: 120, tooltip: true },
+          { label: "站点类型", value: "stationTypeName", width: 120 },
+          { label: "站点安装时间", value: "createTime", minWidth: 120, tooltip: true },
+          { label: "安装人", value: "person", width: 120 },
+          { label: "关联设备", value: "equips", width: 100, type: "slot" },
+          { label: "首次数据接入时间", value: "tt", minWidth: 120, tooltip: true },
+        ],
+        handle: {
+          fixed: "right",
+          label: "操作",
+          width: "80",
+          btList: [
+            { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-2-2' }
+          ]
+        }
+      },
+      //列表相关
+      listTypeInfo: {},
       loadingdelet: undefined,
       loading: false,
       timer: null,
       dialogImageUrl: "",
       dialogVisible: false,
-      PageSize: 10,
-      AllTotal: 0,
-      currentPage: 1,
       title: "站点管理",
-      listExtend: [], // 站点管理的返回数据
       siteTypeList: [], //弹框里面站点类型列表
-      searchStr: "",
-      file: [],
-      startDate: "",
-      endDate: "",
-      pickerOptionsStart: {
-        //结束时间不能大于开始时间
-        disabledDate: time => {
-          if (this.endDate) {
-            return time.getTime() > new Date(this.endDate).getTime();
-          }
-        }
-      },
-      pickerOptionsEnd: {
-        disabledDate: time => {
-          return time.getTime() < new Date(this.startDate).getTime();
-        }
-      },
-      List: [],
-      ledlist: [],
       yzaddflag: false,
       ruleForm: {
         id: "", //站点ID
@@ -431,7 +427,7 @@
       //弹窗相关
       dialogInfo:{
         title: {
-          look: '关联设备列表'
+          look: ''
         },
         width: '60%',
         visible: false,
@@ -441,65 +437,65 @@
           {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: '', //接口地址
+        url: this.nozzle.sysEquipRelatedList, //接口地址
         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: "",
+      //已关联设备表格相关
+      isRelatedDeviceTableInfo: {
+        data: [],
+        query: {
+          sign: ""
+        },
+        selectList: []
+      },
+      //未关联设备表格相关
+      unRelatedDeviceTableInfo: {
+        data: [],
+        query: {
+          sign: "unbound"
+        },
+        selectList: []
+      },
+      //设备关联过滤相关
+      deviceRelatedQuery: {
+        searchStr: "",
+        siteCode: ""
+      }
     };
   },
   mounted() {
-    this.getsyscityList();
-    this.getlistExtend();
+    this.siteTableInfo.refresh = Math.random();
     this.getsityType();
     this.getCurrentUserProject(); //获取当前用户所绑定的项目
   },
+  computed: {
+    //移除按钮是否可点击
+    isCanRemoveDevice() {
+      return this.isRelatedDeviceTableInfo.selectList.length ? false : true;
+    },
+    //添加按钮是否可点击
+    isCanInsertDevice() {
+      return this.unRelatedDeviceTableInfo.selectList.length ? false : true;
+    },
+    ...mapGetters(["allDept", "allRole", "allCity"])
+  },
   watch: {
     "ruleForm.area": {
       handler(newVal, oldVal) {
         if (this.$refs.cascader) {
           let children = this.$refs.cascader.getCheckedNodes();
-          // console.log(children);
           if (
             children.length &&
             children[0].children &&
             children[0].children.length < 1
           ) {
-            // console.log(9999);
             this.$refs.cascader.dropDownVisible = false;
           }
         }
@@ -516,30 +512,18 @@
     "dialogInfo.visible"(val) {
       if(!val) {
         this.deviceTableInfo.data = [];
+        this.deviceRelatedQuery.searchStr = "";
         this.dialogInfo.btLoading = false;
       }
+    },
+    "deviceRelatedQuery.searchStr"(val) {
+      Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+      Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
     }
   },
   methods: {
-    //将空的children置为undefined,避免在没有下一级数据的情况下显示暂无数据
-    removeEmptyChild(arr) {
-      arr.forEach(item => {
-        if (!item.children || item.children.length < 1) {
-          item.children = undefined;
-        } else {
-          this.removeEmptyChild(item.children);
-        }
-      });
-      return arr;
-    },
-    handleChangeSearch() {
-      this.currentPage = 1;
-      this.getlistExtend();
-    },
     //上传头像
     fileChange(file) {
-      // console.log(file.size, file.raw.type);
-      // const isJPG = file.raw.type === "image/jpeg";
       this.loading = true;
       const isLt1M = file.size / 1024 / 1024 < 1;
       if (file.raw.type != "image/jpeg" && file.raw.type != "image/png") {
@@ -559,25 +543,24 @@
       let config = {
         headers: { "Content-Type": "multipart/form-data" }
       };
-      axios
-        .post(this.nozzle.upload, formdata, config)
-        .then(res => {
-          if (res.data.code == 1) {
-            this.loading = false;
-            this.$message({
-              message: "上传图片成功！",
-              type: "success"
-            });
-            this.ruleForm.fileList.push(res.data.data[0]);
-          }
-        })
-        .catch(res => {
+      axios.post(this.nozzle.upload, formdata, config).then(res => {
+        if (res.data.code == 1) {
           this.loading = false;
           this.$message({
-            message: "服务器问题！请重试！",
-            type: "warning"
+            message: "上传图片成功！",
+            type: "success"
           });
+          this.ruleForm.fileList.push(res.data.data[0]);
+          this.siteTableInfo.refresh = Math.random();
+        }
+      })
+      .catch(res => {
+        this.loading = false;
+        this.$message({
+          message: "服务器问题！请重试！",
+          type: "warning"
         });
+      });
     },
     // 删除图片按钮
     deleteImg(fileNo) {
@@ -633,39 +616,24 @@
       this.dialogImageUrl = file.fileCloudStorageKey;
       this.dialogVisible = true;
     },
-    // 获取站点列表
-    async getlistExtend() {
-      const { data } = await this.$http.post(this.nozzle.listExtend, {
-        current: this.currentPage,
-        data: {
-          searchStr: this.searchStr,
-          startDate: this.startDate,
-          endDate: this.endDate
-        },
-        size: this.PageSize
-      });
-      this.listExtend = data.data.list;
-      this.AllTotal = data.data.total;
-    },
-    // 搜索查询按钮
-    search() {
-      this.currentPage = 1;
-      this.getlistExtend();
-    },
-    deleteRow(index, rows) {
-      rows.splice(index, 1);
-    },
     // 弹框提交表单按钮
     saveOru(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
-          this.$http
-            .post(this.nozzle.saveOrupdate, {
-              data: this.ruleForm
-            })
-            .then(res => {
+          this.$http.post(this.nozzle.saveOrupdate, {
+            data: this.ruleForm
+          })
+          .then(res => {
+            if(res.data.code === 1) {
+              this.siteTableInfo.refresh = Math.random();
               this.yzaddflag = false;
-            });
+            }
+            this.$message({
+              message: res.data.msg,
+              type: res.data.code === 1 ? 'success' : 'error',
+              showClose: true,
+            })
+          });
         }
       });
     },
@@ -674,7 +642,6 @@
       this.yzaddflag = false;
       this.$refs[formName].resetFields();
     },
-
     visiblechange(visible) {
       if (visible) {
         this.timer = setInterval(() => {
@@ -690,34 +657,6 @@
         clearInterval(this.timer);
       }
     },
-    // 添加站点
-    addform(formName) {
-      this.yzaddflag = true;
-      // 获取地区列表
-      this.title = "新增站点";
-    },
-    // 操作里面的修改弹窗
-    EditFZ(index, rows) {
-      // 获取地区列表
-      for (let key in rows) {
-        if (key === "stationType") {
-          rows[key] = rows[key].toString();
-        }
-        this.ruleForm[key] = rows[key];
-      }
-      this.yzaddflag = true;
-      this.title = "修改站点";
-      this.FenZuflag2type = 2;
-      this.AddFZInput = rows.groupName;
-      this.ClickID = rows.id;
-    },
-    // 获取地区列表数据
-    async getsyscityList() {
-      const { data } = await this.$http.post(this.nozzle.syscity);
-
-      let arr = this.removeEmptyChild(data.data);
-      this.syscityList = data.data;
-    },
     //获取站点类型列表
     async getsityType() {
       const { data } = await this.$http.post(this.nozzle.sityType, {
@@ -745,43 +684,98 @@
         }
       })
     },
+    //表格checkbox选择事件
+    handleEvent(event, data) {
+      switch (event) {
+        case "isRelated":
+          this.isRelatedDeviceTableInfo.selectList = data;
+          break;
+        case "unRelated":
+          this.unRelatedDeviceTableInfo.selectList = data;
+          break;
+      }
+    },
     //点击事件
     handleClick(event, data, index){
       switch(event) {
+        //站点搜索
+        case "search":
+          this.siteTableInfo.initCurpage = Math.random();
+          this.siteTableInfo.refresh = Math.random();
+          break;
+        //添加站点
+        case "create":
+          this.yzaddflag = true;
+          this.title = "新增站点";
+          this.syscityList = this.removeEmptyChild(this.allCity);
+          break;
+        //编辑站点
+        case "update":
+          this.title = "修改站点";
+          for (let key in data) {
+            if (key === "stationType") {
+              data[key] = data[key].toString();
+            }
+            this.ruleForm[key] = data[key];
+          }
+          this.syscityList = this.removeEmptyChild(this.allCity);
+          this.yzaddflag = true;
+          break;
         //查看关联设备
         case "look":
-          this.dialogInfo.visible = true;
           this.dialogInfo.type = event;
-          this.deviceTableInfo.data = data.equips;
-          this.needHandleSiteCode = data.stCode;
+          this.deviceRelatedQuery.siteCode = data.stCode;
+          this.dialogInfo.visible = true;
+          setTimeout(() => {
+            Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+            Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+            this.deviceTableInfo.refresh = Math.random();
+          }, 0);
+          break;
+        //关联设备搜索
+        case "deviceSearch":
+          this.deviceTableInfo.initCurpage = Math.random();
+          this.deviceTableInfo.refresh = Math.random();
+          break;
+        //添加设备到站点
+        case "insert":
+          const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map( item => item.equipNo);
+          const insertData = {
+            siteCode: this.unRelatedDeviceTableInfo.query.siteCode,
+            equipNos: insertEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipInsertBatch, { data: insertData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              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
+            });
+          });
           break;
         //解绑设备与站点
         case "remove":
-          this.$confirm("此操作将解除设备和站点的绑定关系, 是否继续?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(res =>{
-            const params = {
-              data: {
-                siteCode: this.needHandleSiteCode,
-                equipNos: [data.equipNo]
-              }
+          const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(item => item.equipNo);
+          const removeData = {
+            siteCode: this.isRelatedDeviceTableInfo.query.siteCode,
+            equipNos: removeEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipRemoveBatch, { data: removeData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              this.deviceTableInfo.refresh = Math.random();
+              this.deviceTableInfo.initCurpage = Math.random();
             }
-            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(() =>{})
+            this.$message({
+              message: res.data.msg,
+              type: res.data.code === 1 ? "success" : "error",
+              showClose: true
+            });
+          }).catch(e =>{console.log(e)});
           break;
         //关闭
         case "close":
@@ -820,19 +814,21 @@
       };
       this.$refs.cascader.$refs.panel.activePath = [];
       this.$refs.cascader.$refs.panel.clearCheckedNodes();
-      // this.getlistExtend();
     },
     handleChange(value) {
       // 取选中数组的最后一项的id
       this.ruleForm.area = value.slice(-1)[0];
     },
-    handleSizeChange(val) {
-      this.PageSize = val;
-      this.getlistExtend();
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getlistExtend();
+    //将空的children置为undefined,避免在没有下一级数据的情况下显示暂无数据
+    removeEmptyChild(arr) {
+      arr.forEach(item => {
+        if (!item.children || item.children.length < 1) {
+          item.children = undefined;
+        } else {
+          this.removeEmptyChild(item.children);
+        }
+      });
+      return arr;
     }
   },
   destroyed() {
@@ -841,15 +837,10 @@
 };
 </script>
 <style lang="scss" scoped>
-/deep/ .el-pagination .el-pager li.active {
-  background-color: #409eff !important;
-  cursor: default;
-}
 .imgtype {
   width: 150px;
   height: 100px;
 }
-
 /deep/ .el-upload-list {
   display: none;
 }
@@ -858,7 +849,6 @@
   margin: 0 20px 20px 0;
   position: relative;
 }
-
 .deleteSpan {
   position: absolute;
   display: inline-block;
@@ -893,26 +883,33 @@
   width: 200px;
   margin: 0 10px;
 }
-
-.title {
-  height: 50px;
-  line-height: 50px;
+.title, .table-title{
+  @include hl(30px,30px);
+  color: #409EFF;
   text-align: center;
   font-size: 16px;
+  margin-bottom: 10px;
 }
-
 .tableSection {
   padding: 10px;
   background: rgba(270, 255, 255, 0.05);
 }
 /deep/ .el-dialog .el-dialog__body {
   text-align: left;
+  padding-bottom: 0;
 }
-
 .el-dialog .selectInput {
   width: 30% !important;
 }
 .el-dialog .selectInput .el-select-dropdown__empty {
   width: 100% !important;
 }
+.btn-group {
+  height: 100%;
+  @include fdaj(center, center);
+  /deep/ .el-button + .el-button {
+    margin-left: 0;
+    margin-top: 10px;
+  }
+}
 </style>
diff --git a/src/components/ConfigManager/device.vue b/src/components/ConfigManager/device.vue
index f800811..bc4ccda 100644
--- a/src/components/ConfigManager/device.vue
+++ b/src/components/ConfigManager/device.vue
@@ -35,22 +35,97 @@
     </div>
     <!--弹窗-->
     <page-dialog
+      class="page-data-dialog"
       :title="dialogInfo.title[dialogInfo.type]"
       :visible.sync="dialogInfo.visible"
-      :width="dialogInfo.width"
+      :width="dialogInfo.type === 'relate' ? '80%' : '500px'"
       :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"
-      />
+      <!--关联因子-->
+      <template v-if="dialogInfo.type === 'relate'">
+        <div class="page-filter">
+          <el-form :inline="true" :model="factorQuery" ref="factorQuery" size="medium">
+            <el-form-item label="">
+              <el-input v-model="factorQuery.searchStr" placeholder="因子名称/ASCII码" clearable></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="medium" @click="handleClick('factorSearch')">查询</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="page-content">
+          <el-row :gutter="20" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">未关联因子列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="unRelated"
+                :api-url="factorTableInfo.url"
+                :refresh="factorTableInfo.refresh"
+                :data.sync="unRelatedFactorTableInfo.data"
+                :query="unRelatedFactorTableInfo.query"
+                :init-curpage="factorTableInfo.initCurpage"
+                :field-list="factorTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+            <el-col :span="4" class="h-100">
+              <div class="btn-group">
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-right"
+                  :disabled="isCanInsertFactor"
+                  @click="handleClick('insert')"
+                  >添加</el-button
+                >
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-left"
+                  :disabled="isCanRemoveFactor"
+                  @click="handleClick('remove')"
+                  >移除</el-button
+                >
+              </div>
+            </el-col>
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">已关联因子列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="isRelated"
+                :api-url="factorTableInfo.url"
+                :refresh="factorTableInfo.refresh"
+                :data.sync="isRelatedFactorTableInfo.data"
+                :query="isRelatedFactorTableInfo.query"
+                :init-curpage="factorTableInfo.initCurpage"
+                :field-list="factorTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+          </el-row>
+        </div>
+      </template>
+      <!--新增/修改表单-->
+      <template v-else>
+        <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"
+        />
+      </template>
     </page-dialog>
   </div>
 </template>
@@ -80,8 +155,8 @@
           {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"}
+          {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "search", show: true},
+          {type: "button", label: "添加设备", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-3-1"}
         ]
       },
       //设备表格相关
@@ -89,9 +164,7 @@
         url: this.nozzle.sysEquipList, //接口地址
         refresh: 1,
         initCurpage: 1,
-        data: [
-          {equipNo:1000,equipDesc:"3333",equipFactory:'4444'}
-        ],
+        data: [],
         fieldList: [
           { label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
           { label: "设备描述", value: "equipDesc", minWidth: 150, tooltip: true },
@@ -105,8 +178,9 @@
         handle: {
           fixed: "right",
           label: "操作",
-          width: "120",
+          width: "180",
           btList: [
+            { label: "关联因子", size: "small", type: "text", event: "relate", show: true, has: 'm11-3-4' },
             { 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' }
           ]
@@ -143,18 +217,60 @@
       //弹窗相关
       dialogInfo:{
         title: {
-          update: '编辑设备',
-          create: '添加设备'
+          update: "编辑设备",
+          create: "添加设备",
+          relate: "",
         },
-        width: '500px',
+        width: "500px",
         visible: false,
         btLoading: false,
-        type: '',
+        type: "",
         btList: [
-          {label:'关闭',type:'',icon:'',event:'close',show:true},
-          {label:'保存',type:'primary',icon:'',event:'save',show:true,loading:true}
+          {label:"关闭",type:"",icon:"",event:"close",show:true},
+          {label:"保存",type:"primary",icon:"",event:"save",show:true,loading:true}
         ]
       },
+      //因子表格通用相关
+      factorTableInfo: {
+        url: this.nozzle.sysEquipFactorList, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        fieldList: [
+          { label: "因子名称", value: "codeProperty", minWidth: 100, tooltip: true },
+          { label: "因子ASCII码", value: "codeAscll", minWidth: 100, tooltip: true },
+        ]
+      },
+      //已关联因子表格相关
+      isRelatedFactorTableInfo: {
+        data: [],
+        query: {
+          sign: ""
+        },
+        selectList: []
+      },
+      //未关联因子表格相关
+      unRelatedFactorTableInfo: {
+        data: [],
+        query: {
+          sign: "unbound"
+        },
+        selectList: []
+      },
+      //设备关联过滤相关
+      factorQuery: {
+        searchStr: "",
+        equipNo: ""
+      }
+    }
+  },
+  computed: {
+    //移除按钮是否可点击
+    isCanRemoveFactor() {
+      return this.isRelatedFactorTableInfo.selectList.length ? false : true;
+    },
+    //添加按钮是否可点击
+    isCanInsertFactor() {
+      return this.unRelatedFactorTableInfo.selectList.length ? false : true;
     }
   },
   watch: {
@@ -165,8 +281,20 @@
         }
         this.resetForm();
         this.btnLoading = false;
+        this.factorQuery.searchStr = "";
       }
     },
+    "dialogInfo.type"(val) {
+      this.dialogInfo.btList.forEach(item =>{
+        if(item.event === "save") {
+          item.show = val === "relate" ? false : true;
+        }
+      })
+    },
+    "factorQuery.searchStr"(val) {
+      Object.assign(this.isRelatedFactorTableInfo.query, this.factorQuery);
+      Object.assign(this.unRelatedFactorTableInfo.query, this.factorQuery);
+    }
   },
   created() {
     this.initSiteData();
@@ -198,6 +326,17 @@
         }
       })
     },
+    //表格checkbox选择事件
+    handleEvent(event, data) {
+      switch (event) {
+        case "isRelated":
+          this.isRelatedFactorTableInfo.selectList = data;
+          break;
+        case "unRelated":
+          this.unRelatedFactorTableInfo.selectList = data;
+          break;
+      }
+    },
     //点击事件
     handleClick(event, data) {
       switch (event) {
@@ -243,6 +382,62 @@
             })
           }).catch(() =>{})
           break;
+        //查看关联因子
+        case "relate":
+          this.dialogInfo.type = event;
+          this.factorQuery.equipNo = data.equipNo;
+          this.dialogInfo.visible = true;
+          setTimeout(() => {
+            Object.assign(this.isRelatedFactorTableInfo.query, this.factorQuery);
+            Object.assign(this.unRelatedFactorTableInfo.query, this.factorQuery);
+            this.factorTableInfo.refresh = Math.random();
+          }, 0);
+          break;
+        //关联因子搜索
+        case "factorSearch":
+          this.factorTableInfo.initCurpage = Math.random();
+          this.factorTableInfo.refresh = Math.random();
+          break;
+        //添加因子到站点
+        case "insert":
+          const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map( item => item.equipNo);
+          const insertData = {
+            siteCode: this.unRelatedDeviceTableInfo.query.siteCode,
+            equipNos: insertEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipInsertBatch, { data: insertData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              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
+            });
+          });
+          break;
+        //解绑因子与站点
+        case "remove":
+          const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(item => item.equipNo);
+          const removeData = {
+            siteCode: this.isRelatedDeviceTableInfo.query.siteCode,
+            equipNos: removeEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipRemoveBatch, { data: removeData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              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 =>{console.log(e)});
+          break;
         //关闭
         case "close":
           setTimeout(() => {
@@ -294,4 +489,22 @@
     },
   }
 }
-</script>
\ No newline at end of file
+</script>
+
+<style lang="scss" scoped>
+.table-title{
+  @include hl(30px,30px);
+  color: #409EFF;
+  text-align: center;
+  font-size: 16px;
+  margin-bottom: 10px;
+}
+.btn-group {
+  height: 100%;
+  @include fdaj(center, center);
+  /deep/ .el-button + .el-button {
+    margin-left: 0;
+    margin-top: 10px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/ConfigManager/factor.vue b/src/components/ConfigManager/factor.vue
new file mode 100644
index 0000000..f38f0b9
--- /dev/null
+++ b/src/components/ConfigManager/factor.vue
@@ -0,0 +1,79 @@
+<template>
+  <div class="page-data">
+    <!--搜素框-->
+    <div class="page-filter">
+      <page-filter
+        :query.sync="factorFilterInfo.query"
+        :filter-list="factorFilterInfo.list"
+        @handleClick="handleClick"
+      />
+    </div>
+    <div class="page-content">
+      <!--表格-->
+      <div class="h-100">
+        <page-table
+          tabIndex
+          pagination
+          :api-url="factorTableInfo.url"
+          :refresh="factorTableInfo.refresh"
+          :data.sync="factorTableInfo.data"
+          :query="factorFilterInfo.query"
+          :page-query="factorTableInfo.pageQuery"
+          :init-curpage="factorTableInfo.initCurpage"
+          :field-list="factorTableInfo.fieldList"
+          @handleClick="handleClick"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { message } from "./../../util/item";
+export default {
+  data() {
+    return {
+      //因子搜索相关
+      factorFilterInfo: {
+        query: {
+          searchStr: "",
+        },
+        list: [
+          {type: "input", label: "因子名称/ASCII码", value: "searchStr", hideLabel: true },
+          {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "search", show: true},
+        ]
+      },
+      //因子表格相关
+      factorTableInfo: {
+        url: this.nozzle.sysEquipConfigList, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [],
+        fieldList: [
+          { label: "因子名称", value: "codeProperty", minWidth: 150, tooltip: true },
+          { label: "因子ASCII码", value: "codeAscll", minWidth: 100, tooltip: true },
+          { label: "水文编号", value: "code", minWidth: 100, tooltip: true },
+          { label: "因子最大值", value: "maxValue", minWidth: 100, tooltip: true },
+          { label: "因子最小值", value: "minValue", minWidth: 100, tooltip: true },
+          { label: "因子单位", value: "unit", minWidth: 100, tooltip: true },
+        ]
+      }
+    }
+  },
+  mounted() {
+    this.factorTableInfo.refresh = Math.random();
+  },
+  methods: {
+    //点击事件
+    handleClick(event, data) {
+      switch (event) {
+        //设备搜索
+        case "search":
+          this.factorTableInfo.initCurpage = Math.random();
+          this.factorTableInfo.refresh = Math.random();
+          break;
+      }
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index 065f3da..31253a6 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -35,6 +35,7 @@
     </div>
     <!--弹窗-->
     <el-dialog
+      class="page-data-dialog"
       :width="dialogInfo.width"
       append-to-body
       :title="dialogInfo.title[dialogInfo.type]"
@@ -55,9 +56,10 @@
         </div>
         <div class="page-content">
           <el-row :gutter="20" class="h-100">
-            <el-col :span="10" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">未关联站点列表</div>
               <page-table
-                tabIndex
+                class="flex-1"
                 checkBox
                 pagination
                 type="unRelate"
@@ -91,9 +93,10 @@
                 >
               </div>
             </el-col>
-            <el-col :span="10" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">已关联站点列表</div>
               <page-table
-                tabIndex
+                class="flex-1"
                 checkBox
                 pagination
                 type="isRelate"
@@ -244,8 +247,8 @@
           {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: "searchProject", show: true},
-          {type: "button", label: "添加项目", btType: "primary", icon: "", event: "create", show: true, has: "m11-1-4"}
+          {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "searchProject", show: true},
+          {type: "button", label: "添加项目", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-1-4"}
         ]
       },
       //项目表格相关
@@ -269,7 +272,7 @@
           width: "240",
           btList: [
             { label: "分配权限", size: "small", type: "text", event: "permission", show: true, has: 'm11-1-1' },
-            { label: "项目关联站点", size: "small", type: "text", event: "relate", show: true, has: 'm11-1-2' },
+            { label: "关联站点", size: "small", type: "text", event: "relate", show: true, has: 'm11-1-2' },
             { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-1-3' },
             { label: "删除", size: "small", type: "text", event: "delete", show: true, has: 'm11-1-5' }
           ]
@@ -329,10 +332,9 @@
         xmlxList: [{ key: "合同项目", value: "0" }, { key: "临测项目", value: "1" }],
         groupList: [],
         deptTree: [],
-        roleTree: [],
         userType: [{ key: "普通用户", value: 0 }, { key: "超级管理员", value: 1 }],
         statusList: [{ key: "未管理", value: 0 }, { key: "管理中", value: 1 }],
-        roleList: [{ key: "111", value: 0 }, { key: "2222", value: 1 }],
+        roleList: [],
       },
       //用户弹窗相关
       userDialogInfo: {
@@ -679,7 +681,6 @@
           this.dialogInfo.visible = true;
           this.dialogInfo.type = event;
           this.listTypeInfo.deptTree = this.allDept;
-          this.listTypeInfo.roleTree = this.allRole;
           this.needHandleProjectId = data.platformCode;
           this.permissionFilterInfo.query.platformCode = data.platformCode;
           setTimeout(() => {
@@ -1005,14 +1006,16 @@
   .el-dialog__body {
     @include fd();
     flex: 1;
-    padding: 20px;
+    padding-bottom: 0;
     overflow-y: auto;
   }
-  .el-pagination__sizes,
-  .el-pagination__total,
-  .el-pagination__jump {
-    display: none;
-  }
+}
+.table-title{
+  @include hl(30px,30px);
+  color: #409EFF;
+  text-align: center;
+  font-size: 16px;
+  margin-bottom: 10px;
 }
 .userDialog {
   /deep/ .el-form-item {
diff --git a/src/components/common/PageFilter/index.vue b/src/components/common/PageFilter/index.vue
index a4e93b0..614a410 100644
--- a/src/components/common/PageFilter/index.vue
+++ b/src/components/common/PageFilter/index.vue
@@ -238,4 +238,7 @@
       z-index: 10;
     }
   }
+  /deep/ .el-icon-date:before{
+    color: #fff;
+  }
 </style>

diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index b4e4a8f..440a79e 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -78,6 +78,15 @@
   background: transparent;
 }
 /****页面通用样式****/
+.flex{
+  display: flex;
+}
+.flex-1{
+  flex: 1;
+}
+.flex-d{
+  flex-direction: column;
+}
 .page-data {
   display: flex;
   flex-direction: column;
@@ -108,10 +117,10 @@
   flex-direction: column;
   flex: 1;
   padding: 20px;
+  padding-bottom: 0 !important;
   overflow-y: auto;
 }
 .page-data-dialog .el-pagination__sizes,
-.page-data-dialog .el-pagination__total,
 .page-data-dialog .el-pagination__jump{
-  display: none;
+  display: none !important;
 }
\ No newline at end of file
diff --git a/src/assets/css/mixin.css b/src/assets/css/mixin.css
deleted file mode 100644
index 9e97d02..0000000
--- a/src/assets/css/mixin.css
+++ /dev/null
@@ -1 +0,0 @@
-/* No CSS *//*# sourceMappingURL=mixin.css.map */
\ No newline at end of file
diff --git a/src/assets/css/mixin.css.map b/src/assets/css/mixin.css.map
deleted file mode 100644
index 356f200..0000000
--- a/src/assets/css/mixin.css.map
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "version": 3,
-    "mappings": "",
-    "sources": [
-        "mixin.scss"
-    ],
-    "names": [],
-    "file": "mixin.css"
-}
\ No newline at end of file
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 219a678..281044c 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -1,107 +1,37 @@
 <template>
-  <div id="pagetwo">
-    <div class="form">
-      <el-input
-        v-model="searchStr"
-        placeholder="请输入站点编号或站点名称"
-        clearable
-        @change="handleChangeSearch"
-      ></el-input>
-      <el-date-picker
-        v-model="startDate"
-        value-format="yyyy-MM-dd"
-        :picker-options="pickerOptionsStart"
-        type="date"
-        :clearable="true"
-        placeholder="请选择开始日期"
+  <div id="pagetwo" class="page-data">
+    <!--搜素框-->
+    <div class="page-filter">
+      <page-filter
+        :query.sync="siteFilterInfo.query"
+        :filter-list="siteFilterInfo.list"
+        @handleClick="handleClick"
       />
-      <el-date-picker
-        v-model="endDate"
-        value-format="yyyy-MM-dd"
-        :picker-options="pickerOptionsEnd"
-        type="date"
-        :clearable="true"
-        placeholder="请选择结束日期"
-      />
-      <el-button
-        type="primary"
-        icon="el-icon-search"
-        @click="search"
-        v-has="'Search'"
-        >查询</el-button
-      >
-      <el-button
-        type="primary"
-        icon="el-icon-circle-plus-outline"
-        @click="addform('ruleForm')"
-        v-has="'m11-2-1'"
-        >添加站点</el-button
-      >
     </div>
-
-    <el-table :data="listExtend" style="width: 100%; height: calc(100% - 82px)">
-      <el-table-column
-        type="index"
-        label="序号"
-        width="70"
-      ></el-table-column>
-      <el-table-column
-        prop="stCode"
-        label="站点编号"
-        max-width="120"
-        show-overflow-tooltip
-      ></el-table-column>
-      <el-table-column
-        prop="stName"
-        label="站点名称"
-        show-overflow-tooltip
-        max-width="150"
-      ></el-table-column>
-      <el-table-column label="站点类型" width="120">
-        <template slot-scope="scope">
-          <div>
-            <span v-if="scope.row.stationType == 0">水质站</span>
-            <span v-if="scope.row.stationType == 1">水位站</span>
-            <span v-if="scope.row.stationType == 2">流量站</span>
-          </div>
-        </template></el-table-column
-      >
-      <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"
-            size="small"
-            @click="EditFZ(scope.$index, scope.row)"
-            style="margin: 0 10px"
-            v-has="'m11-2-2'"
-            >修改</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
+    <div class="page-content">
+      <!--表格-->
+      <div class="h-100">
+        <page-table
+          tabIndex
+          pagination
+          :api-url="siteTableInfo.url"
+          :refresh="siteTableInfo.refresh"
+          :data.sync="siteTableInfo.data"
+          :query="siteFilterInfo.query"
+          :page-query="siteTableInfo.pageQuery"
+          :list-type-info="listTypeInfo"
+          :init-curpage="siteTableInfo.initCurpage"
+          :field-list="siteTableInfo.fieldList"
+          :handle="siteTableInfo.handle"
+          @handleClick="handleClick"
+        >
+          <!-- 自定义插槽显示状态 -->
+          <template v-slot:col-equips="scope">
+            <el-button type="text" size="small" @click="handleClick('look',scope.row)">查看设备</el-button>
+          </template>
+        </page-table>
+      </div>
+    </div>
 
     <!-- 新增/修改的弹出框 -->
     <el-dialog
@@ -266,72 +196,138 @@
       class="page-data-dialog"
       :title="dialogInfo.title[dialogInfo.type]"
       :visible.sync="dialogInfo.visible"
-      :width="dialogInfo.width"
+      width="80%"
       :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"
-      />
+      <template v-if="dialogInfo.type === 'look'">
+        <div class="page-filter">
+          <el-form :inline="true" :model="deviceRelatedQuery" ref="deviceRelatedQuery" size="medium">
+            <el-form-item label="">
+              <el-input v-model="deviceRelatedQuery.searchStr" placeholder="请输入设备编号/厂家" clearable></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="medium" @click="handleClick('deviceSearch')">查询</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="page-content">
+          <el-row :gutter="20" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">未关联设备列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="unRelated"
+                :api-url="deviceTableInfo.url"
+                :refresh="deviceTableInfo.refresh"
+                :data.sync="unRelatedDeviceTableInfo.data"
+                :query="unRelatedDeviceTableInfo.query"
+                :init-curpage="deviceTableInfo.initCurpage"
+                :field-list="deviceTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+            <el-col :span="4" class="h-100">
+              <div class="btn-group">
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-right"
+                  :disabled="isCanInsertDevice"
+                  @click="handleClick('insert')"
+                  >添加</el-button
+                >
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-left"
+                  :disabled="isCanRemoveDevice"
+                  @click="handleClick('remove')"
+                  >移除</el-button
+                >
+              </div>
+            </el-col>
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">已关联设备列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="isRelated"
+                :api-url="deviceTableInfo.url"
+                :refresh="deviceTableInfo.refresh"
+                :data.sync="isRelatedDeviceTableInfo.data"
+                :query="isRelatedDeviceTableInfo.query"
+                :init-curpage="deviceTableInfo.initCurpage"
+                :field-list="deviceTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+          </el-row>
+        </div>
+      </template>
     </page-dialog>
-    <el-pagination
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page="currentPage"
-      :page-sizes="[10, 20, 30, 40]"
-      :page-size="PageSize"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="AllTotal"
-    >
-    </el-pagination>
   </div>
 </template>
 <script>
 import axios from "axios";
-
+import { mapGetters } from "vuex";
 export default {
-  name: "StatisticalReport",
   data() {
     return {
+      //站点搜索相关
+      siteFilterInfo: {
+        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: "el-icon-search", event: "search", show: true},
+          {type: "button", label: "添加站点", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-2-1"}
+        ]
+      },
+      //站点表格相关
+      siteTableInfo: {
+        url: this.nozzle.listExtend, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [],
+        fieldList: [
+          { label: "站点编号", value: "stCode", minWidth: 120, tooltip: true },
+          { label: "站点名称", value: "stName", minWidth: 120, tooltip: true },
+          { label: "站点类型", value: "stationTypeName", width: 120 },
+          { label: "站点安装时间", value: "createTime", minWidth: 120, tooltip: true },
+          { label: "安装人", value: "person", width: 120 },
+          { label: "关联设备", value: "equips", width: 100, type: "slot" },
+          { label: "首次数据接入时间", value: "tt", minWidth: 120, tooltip: true },
+        ],
+        handle: {
+          fixed: "right",
+          label: "操作",
+          width: "80",
+          btList: [
+            { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-2-2' }
+          ]
+        }
+      },
+      //列表相关
+      listTypeInfo: {},
       loadingdelet: undefined,
       loading: false,
       timer: null,
       dialogImageUrl: "",
       dialogVisible: false,
-      PageSize: 10,
-      AllTotal: 0,
-      currentPage: 1,
       title: "站点管理",
-      listExtend: [], // 站点管理的返回数据
       siteTypeList: [], //弹框里面站点类型列表
-      searchStr: "",
-      file: [],
-      startDate: "",
-      endDate: "",
-      pickerOptionsStart: {
-        //结束时间不能大于开始时间
-        disabledDate: time => {
-          if (this.endDate) {
-            return time.getTime() > new Date(this.endDate).getTime();
-          }
-        }
-      },
-      pickerOptionsEnd: {
-        disabledDate: time => {
-          return time.getTime() < new Date(this.startDate).getTime();
-        }
-      },
-      List: [],
-      ledlist: [],
       yzaddflag: false,
       ruleForm: {
         id: "", //站点ID
@@ -431,7 +427,7 @@
       //弹窗相关
       dialogInfo:{
         title: {
-          look: '关联设备列表'
+          look: ''
         },
         width: '60%',
         visible: false,
@@ -441,65 +437,65 @@
           {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: '', //接口地址
+        url: this.nozzle.sysEquipRelatedList, //接口地址
         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: "",
+      //已关联设备表格相关
+      isRelatedDeviceTableInfo: {
+        data: [],
+        query: {
+          sign: ""
+        },
+        selectList: []
+      },
+      //未关联设备表格相关
+      unRelatedDeviceTableInfo: {
+        data: [],
+        query: {
+          sign: "unbound"
+        },
+        selectList: []
+      },
+      //设备关联过滤相关
+      deviceRelatedQuery: {
+        searchStr: "",
+        siteCode: ""
+      }
     };
   },
   mounted() {
-    this.getsyscityList();
-    this.getlistExtend();
+    this.siteTableInfo.refresh = Math.random();
     this.getsityType();
     this.getCurrentUserProject(); //获取当前用户所绑定的项目
   },
+  computed: {
+    //移除按钮是否可点击
+    isCanRemoveDevice() {
+      return this.isRelatedDeviceTableInfo.selectList.length ? false : true;
+    },
+    //添加按钮是否可点击
+    isCanInsertDevice() {
+      return this.unRelatedDeviceTableInfo.selectList.length ? false : true;
+    },
+    ...mapGetters(["allDept", "allRole", "allCity"])
+  },
   watch: {
     "ruleForm.area": {
       handler(newVal, oldVal) {
         if (this.$refs.cascader) {
           let children = this.$refs.cascader.getCheckedNodes();
-          // console.log(children);
           if (
             children.length &&
             children[0].children &&
             children[0].children.length < 1
           ) {
-            // console.log(9999);
             this.$refs.cascader.dropDownVisible = false;
           }
         }
@@ -516,30 +512,18 @@
     "dialogInfo.visible"(val) {
       if(!val) {
         this.deviceTableInfo.data = [];
+        this.deviceRelatedQuery.searchStr = "";
         this.dialogInfo.btLoading = false;
       }
+    },
+    "deviceRelatedQuery.searchStr"(val) {
+      Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+      Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
     }
   },
   methods: {
-    //将空的children置为undefined,避免在没有下一级数据的情况下显示暂无数据
-    removeEmptyChild(arr) {
-      arr.forEach(item => {
-        if (!item.children || item.children.length < 1) {
-          item.children = undefined;
-        } else {
-          this.removeEmptyChild(item.children);
-        }
-      });
-      return arr;
-    },
-    handleChangeSearch() {
-      this.currentPage = 1;
-      this.getlistExtend();
-    },
     //上传头像
     fileChange(file) {
-      // console.log(file.size, file.raw.type);
-      // const isJPG = file.raw.type === "image/jpeg";
       this.loading = true;
       const isLt1M = file.size / 1024 / 1024 < 1;
       if (file.raw.type != "image/jpeg" && file.raw.type != "image/png") {
@@ -559,25 +543,24 @@
       let config = {
         headers: { "Content-Type": "multipart/form-data" }
       };
-      axios
-        .post(this.nozzle.upload, formdata, config)
-        .then(res => {
-          if (res.data.code == 1) {
-            this.loading = false;
-            this.$message({
-              message: "上传图片成功！",
-              type: "success"
-            });
-            this.ruleForm.fileList.push(res.data.data[0]);
-          }
-        })
-        .catch(res => {
+      axios.post(this.nozzle.upload, formdata, config).then(res => {
+        if (res.data.code == 1) {
           this.loading = false;
           this.$message({
-            message: "服务器问题！请重试！",
-            type: "warning"
+            message: "上传图片成功！",
+            type: "success"
           });
+          this.ruleForm.fileList.push(res.data.data[0]);
+          this.siteTableInfo.refresh = Math.random();
+        }
+      })
+      .catch(res => {
+        this.loading = false;
+        this.$message({
+          message: "服务器问题！请重试！",
+          type: "warning"
         });
+      });
     },
     // 删除图片按钮
     deleteImg(fileNo) {
@@ -633,39 +616,24 @@
       this.dialogImageUrl = file.fileCloudStorageKey;
       this.dialogVisible = true;
     },
-    // 获取站点列表
-    async getlistExtend() {
-      const { data } = await this.$http.post(this.nozzle.listExtend, {
-        current: this.currentPage,
-        data: {
-          searchStr: this.searchStr,
-          startDate: this.startDate,
-          endDate: this.endDate
-        },
-        size: this.PageSize
-      });
-      this.listExtend = data.data.list;
-      this.AllTotal = data.data.total;
-    },
-    // 搜索查询按钮
-    search() {
-      this.currentPage = 1;
-      this.getlistExtend();
-    },
-    deleteRow(index, rows) {
-      rows.splice(index, 1);
-    },
     // 弹框提交表单按钮
     saveOru(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
-          this.$http
-            .post(this.nozzle.saveOrupdate, {
-              data: this.ruleForm
-            })
-            .then(res => {
+          this.$http.post(this.nozzle.saveOrupdate, {
+            data: this.ruleForm
+          })
+          .then(res => {
+            if(res.data.code === 1) {
+              this.siteTableInfo.refresh = Math.random();
               this.yzaddflag = false;
-            });
+            }
+            this.$message({
+              message: res.data.msg,
+              type: res.data.code === 1 ? 'success' : 'error',
+              showClose: true,
+            })
+          });
         }
       });
     },
@@ -674,7 +642,6 @@
       this.yzaddflag = false;
       this.$refs[formName].resetFields();
     },
-
     visiblechange(visible) {
       if (visible) {
         this.timer = setInterval(() => {
@@ -690,34 +657,6 @@
         clearInterval(this.timer);
       }
     },
-    // 添加站点
-    addform(formName) {
-      this.yzaddflag = true;
-      // 获取地区列表
-      this.title = "新增站点";
-    },
-    // 操作里面的修改弹窗
-    EditFZ(index, rows) {
-      // 获取地区列表
-      for (let key in rows) {
-        if (key === "stationType") {
-          rows[key] = rows[key].toString();
-        }
-        this.ruleForm[key] = rows[key];
-      }
-      this.yzaddflag = true;
-      this.title = "修改站点";
-      this.FenZuflag2type = 2;
-      this.AddFZInput = rows.groupName;
-      this.ClickID = rows.id;
-    },
-    // 获取地区列表数据
-    async getsyscityList() {
-      const { data } = await this.$http.post(this.nozzle.syscity);
-
-      let arr = this.removeEmptyChild(data.data);
-      this.syscityList = data.data;
-    },
     //获取站点类型列表
     async getsityType() {
       const { data } = await this.$http.post(this.nozzle.sityType, {
@@ -745,43 +684,98 @@
         }
       })
     },
+    //表格checkbox选择事件
+    handleEvent(event, data) {
+      switch (event) {
+        case "isRelated":
+          this.isRelatedDeviceTableInfo.selectList = data;
+          break;
+        case "unRelated":
+          this.unRelatedDeviceTableInfo.selectList = data;
+          break;
+      }
+    },
     //点击事件
     handleClick(event, data, index){
       switch(event) {
+        //站点搜索
+        case "search":
+          this.siteTableInfo.initCurpage = Math.random();
+          this.siteTableInfo.refresh = Math.random();
+          break;
+        //添加站点
+        case "create":
+          this.yzaddflag = true;
+          this.title = "新增站点";
+          this.syscityList = this.removeEmptyChild(this.allCity);
+          break;
+        //编辑站点
+        case "update":
+          this.title = "修改站点";
+          for (let key in data) {
+            if (key === "stationType") {
+              data[key] = data[key].toString();
+            }
+            this.ruleForm[key] = data[key];
+          }
+          this.syscityList = this.removeEmptyChild(this.allCity);
+          this.yzaddflag = true;
+          break;
         //查看关联设备
         case "look":
-          this.dialogInfo.visible = true;
           this.dialogInfo.type = event;
-          this.deviceTableInfo.data = data.equips;
-          this.needHandleSiteCode = data.stCode;
+          this.deviceRelatedQuery.siteCode = data.stCode;
+          this.dialogInfo.visible = true;
+          setTimeout(() => {
+            Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+            Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+            this.deviceTableInfo.refresh = Math.random();
+          }, 0);
+          break;
+        //关联设备搜索
+        case "deviceSearch":
+          this.deviceTableInfo.initCurpage = Math.random();
+          this.deviceTableInfo.refresh = Math.random();
+          break;
+        //添加设备到站点
+        case "insert":
+          const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map( item => item.equipNo);
+          const insertData = {
+            siteCode: this.unRelatedDeviceTableInfo.query.siteCode,
+            equipNos: insertEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipInsertBatch, { data: insertData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              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
+            });
+          });
           break;
         //解绑设备与站点
         case "remove":
-          this.$confirm("此操作将解除设备和站点的绑定关系, 是否继续?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(res =>{
-            const params = {
-              data: {
-                siteCode: this.needHandleSiteCode,
-                equipNos: [data.equipNo]
-              }
+          const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(item => item.equipNo);
+          const removeData = {
+            siteCode: this.isRelatedDeviceTableInfo.query.siteCode,
+            equipNos: removeEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipRemoveBatch, { data: removeData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              this.deviceTableInfo.refresh = Math.random();
+              this.deviceTableInfo.initCurpage = Math.random();
             }
-            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(() =>{})
+            this.$message({
+              message: res.data.msg,
+              type: res.data.code === 1 ? "success" : "error",
+              showClose: true
+            });
+          }).catch(e =>{console.log(e)});
           break;
         //关闭
         case "close":
@@ -820,19 +814,21 @@
       };
       this.$refs.cascader.$refs.panel.activePath = [];
       this.$refs.cascader.$refs.panel.clearCheckedNodes();
-      // this.getlistExtend();
     },
     handleChange(value) {
       // 取选中数组的最后一项的id
       this.ruleForm.area = value.slice(-1)[0];
     },
-    handleSizeChange(val) {
-      this.PageSize = val;
-      this.getlistExtend();
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getlistExtend();
+    //将空的children置为undefined,避免在没有下一级数据的情况下显示暂无数据
+    removeEmptyChild(arr) {
+      arr.forEach(item => {
+        if (!item.children || item.children.length < 1) {
+          item.children = undefined;
+        } else {
+          this.removeEmptyChild(item.children);
+        }
+      });
+      return arr;
     }
   },
   destroyed() {
@@ -841,15 +837,10 @@
 };
 </script>
 <style lang="scss" scoped>
-/deep/ .el-pagination .el-pager li.active {
-  background-color: #409eff !important;
-  cursor: default;
-}
 .imgtype {
   width: 150px;
   height: 100px;
 }
-
 /deep/ .el-upload-list {
   display: none;
 }
@@ -858,7 +849,6 @@
   margin: 0 20px 20px 0;
   position: relative;
 }
-
 .deleteSpan {
   position: absolute;
   display: inline-block;
@@ -893,26 +883,33 @@
   width: 200px;
   margin: 0 10px;
 }
-
-.title {
-  height: 50px;
-  line-height: 50px;
+.title, .table-title{
+  @include hl(30px,30px);
+  color: #409EFF;
   text-align: center;
   font-size: 16px;
+  margin-bottom: 10px;
 }
-
 .tableSection {
   padding: 10px;
   background: rgba(270, 255, 255, 0.05);
 }
 /deep/ .el-dialog .el-dialog__body {
   text-align: left;
+  padding-bottom: 0;
 }
-
 .el-dialog .selectInput {
   width: 30% !important;
 }
 .el-dialog .selectInput .el-select-dropdown__empty {
   width: 100% !important;
 }
+.btn-group {
+  height: 100%;
+  @include fdaj(center, center);
+  /deep/ .el-button + .el-button {
+    margin-left: 0;
+    margin-top: 10px;
+  }
+}
 </style>
diff --git a/src/components/ConfigManager/device.vue b/src/components/ConfigManager/device.vue
index f800811..bc4ccda 100644
--- a/src/components/ConfigManager/device.vue
+++ b/src/components/ConfigManager/device.vue
@@ -35,22 +35,97 @@
     </div>
     <!--弹窗-->
     <page-dialog
+      class="page-data-dialog"
       :title="dialogInfo.title[dialogInfo.type]"
       :visible.sync="dialogInfo.visible"
-      :width="dialogInfo.width"
+      :width="dialogInfo.type === 'relate' ? '80%' : '500px'"
       :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"
-      />
+      <!--关联因子-->
+      <template v-if="dialogInfo.type === 'relate'">
+        <div class="page-filter">
+          <el-form :inline="true" :model="factorQuery" ref="factorQuery" size="medium">
+            <el-form-item label="">
+              <el-input v-model="factorQuery.searchStr" placeholder="因子名称/ASCII码" clearable></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="medium" @click="handleClick('factorSearch')">查询</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="page-content">
+          <el-row :gutter="20" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">未关联因子列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="unRelated"
+                :api-url="factorTableInfo.url"
+                :refresh="factorTableInfo.refresh"
+                :data.sync="unRelatedFactorTableInfo.data"
+                :query="unRelatedFactorTableInfo.query"
+                :init-curpage="factorTableInfo.initCurpage"
+                :field-list="factorTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+            <el-col :span="4" class="h-100">
+              <div class="btn-group">
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-right"
+                  :disabled="isCanInsertFactor"
+                  @click="handleClick('insert')"
+                  >添加</el-button
+                >
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-left"
+                  :disabled="isCanRemoveFactor"
+                  @click="handleClick('remove')"
+                  >移除</el-button
+                >
+              </div>
+            </el-col>
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">已关联因子列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="isRelated"
+                :api-url="factorTableInfo.url"
+                :refresh="factorTableInfo.refresh"
+                :data.sync="isRelatedFactorTableInfo.data"
+                :query="isRelatedFactorTableInfo.query"
+                :init-curpage="factorTableInfo.initCurpage"
+                :field-list="factorTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+          </el-row>
+        </div>
+      </template>
+      <!--新增/修改表单-->
+      <template v-else>
+        <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"
+        />
+      </template>
     </page-dialog>
   </div>
 </template>
@@ -80,8 +155,8 @@
           {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"}
+          {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "search", show: true},
+          {type: "button", label: "添加设备", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-3-1"}
         ]
       },
       //设备表格相关
@@ -89,9 +164,7 @@
         url: this.nozzle.sysEquipList, //接口地址
         refresh: 1,
         initCurpage: 1,
-        data: [
-          {equipNo:1000,equipDesc:"3333",equipFactory:'4444'}
-        ],
+        data: [],
         fieldList: [
           { label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
           { label: "设备描述", value: "equipDesc", minWidth: 150, tooltip: true },
@@ -105,8 +178,9 @@
         handle: {
           fixed: "right",
           label: "操作",
-          width: "120",
+          width: "180",
           btList: [
+            { label: "关联因子", size: "small", type: "text", event: "relate", show: true, has: 'm11-3-4' },
             { 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' }
           ]
@@ -143,18 +217,60 @@
       //弹窗相关
       dialogInfo:{
         title: {
-          update: '编辑设备',
-          create: '添加设备'
+          update: "编辑设备",
+          create: "添加设备",
+          relate: "",
         },
-        width: '500px',
+        width: "500px",
         visible: false,
         btLoading: false,
-        type: '',
+        type: "",
         btList: [
-          {label:'关闭',type:'',icon:'',event:'close',show:true},
-          {label:'保存',type:'primary',icon:'',event:'save',show:true,loading:true}
+          {label:"关闭",type:"",icon:"",event:"close",show:true},
+          {label:"保存",type:"primary",icon:"",event:"save",show:true,loading:true}
         ]
       },
+      //因子表格通用相关
+      factorTableInfo: {
+        url: this.nozzle.sysEquipFactorList, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        fieldList: [
+          { label: "因子名称", value: "codeProperty", minWidth: 100, tooltip: true },
+          { label: "因子ASCII码", value: "codeAscll", minWidth: 100, tooltip: true },
+        ]
+      },
+      //已关联因子表格相关
+      isRelatedFactorTableInfo: {
+        data: [],
+        query: {
+          sign: ""
+        },
+        selectList: []
+      },
+      //未关联因子表格相关
+      unRelatedFactorTableInfo: {
+        data: [],
+        query: {
+          sign: "unbound"
+        },
+        selectList: []
+      },
+      //设备关联过滤相关
+      factorQuery: {
+        searchStr: "",
+        equipNo: ""
+      }
+    }
+  },
+  computed: {
+    //移除按钮是否可点击
+    isCanRemoveFactor() {
+      return this.isRelatedFactorTableInfo.selectList.length ? false : true;
+    },
+    //添加按钮是否可点击
+    isCanInsertFactor() {
+      return this.unRelatedFactorTableInfo.selectList.length ? false : true;
     }
   },
   watch: {
@@ -165,8 +281,20 @@
         }
         this.resetForm();
         this.btnLoading = false;
+        this.factorQuery.searchStr = "";
       }
     },
+    "dialogInfo.type"(val) {
+      this.dialogInfo.btList.forEach(item =>{
+        if(item.event === "save") {
+          item.show = val === "relate" ? false : true;
+        }
+      })
+    },
+    "factorQuery.searchStr"(val) {
+      Object.assign(this.isRelatedFactorTableInfo.query, this.factorQuery);
+      Object.assign(this.unRelatedFactorTableInfo.query, this.factorQuery);
+    }
   },
   created() {
     this.initSiteData();
@@ -198,6 +326,17 @@
         }
       })
     },
+    //表格checkbox选择事件
+    handleEvent(event, data) {
+      switch (event) {
+        case "isRelated":
+          this.isRelatedFactorTableInfo.selectList = data;
+          break;
+        case "unRelated":
+          this.unRelatedFactorTableInfo.selectList = data;
+          break;
+      }
+    },
     //点击事件
     handleClick(event, data) {
       switch (event) {
@@ -243,6 +382,62 @@
             })
           }).catch(() =>{})
           break;
+        //查看关联因子
+        case "relate":
+          this.dialogInfo.type = event;
+          this.factorQuery.equipNo = data.equipNo;
+          this.dialogInfo.visible = true;
+          setTimeout(() => {
+            Object.assign(this.isRelatedFactorTableInfo.query, this.factorQuery);
+            Object.assign(this.unRelatedFactorTableInfo.query, this.factorQuery);
+            this.factorTableInfo.refresh = Math.random();
+          }, 0);
+          break;
+        //关联因子搜索
+        case "factorSearch":
+          this.factorTableInfo.initCurpage = Math.random();
+          this.factorTableInfo.refresh = Math.random();
+          break;
+        //添加因子到站点
+        case "insert":
+          const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map( item => item.equipNo);
+          const insertData = {
+            siteCode: this.unRelatedDeviceTableInfo.query.siteCode,
+            equipNos: insertEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipInsertBatch, { data: insertData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              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
+            });
+          });
+          break;
+        //解绑因子与站点
+        case "remove":
+          const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(item => item.equipNo);
+          const removeData = {
+            siteCode: this.isRelatedDeviceTableInfo.query.siteCode,
+            equipNos: removeEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipRemoveBatch, { data: removeData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              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 =>{console.log(e)});
+          break;
         //关闭
         case "close":
           setTimeout(() => {
@@ -294,4 +489,22 @@
     },
   }
 }
-</script>
\ No newline at end of file
+</script>
+
+<style lang="scss" scoped>
+.table-title{
+  @include hl(30px,30px);
+  color: #409EFF;
+  text-align: center;
+  font-size: 16px;
+  margin-bottom: 10px;
+}
+.btn-group {
+  height: 100%;
+  @include fdaj(center, center);
+  /deep/ .el-button + .el-button {
+    margin-left: 0;
+    margin-top: 10px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/ConfigManager/factor.vue b/src/components/ConfigManager/factor.vue
new file mode 100644
index 0000000..f38f0b9
--- /dev/null
+++ b/src/components/ConfigManager/factor.vue
@@ -0,0 +1,79 @@
+<template>
+  <div class="page-data">
+    <!--搜素框-->
+    <div class="page-filter">
+      <page-filter
+        :query.sync="factorFilterInfo.query"
+        :filter-list="factorFilterInfo.list"
+        @handleClick="handleClick"
+      />
+    </div>
+    <div class="page-content">
+      <!--表格-->
+      <div class="h-100">
+        <page-table
+          tabIndex
+          pagination
+          :api-url="factorTableInfo.url"
+          :refresh="factorTableInfo.refresh"
+          :data.sync="factorTableInfo.data"
+          :query="factorFilterInfo.query"
+          :page-query="factorTableInfo.pageQuery"
+          :init-curpage="factorTableInfo.initCurpage"
+          :field-list="factorTableInfo.fieldList"
+          @handleClick="handleClick"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { message } from "./../../util/item";
+export default {
+  data() {
+    return {
+      //因子搜索相关
+      factorFilterInfo: {
+        query: {
+          searchStr: "",
+        },
+        list: [
+          {type: "input", label: "因子名称/ASCII码", value: "searchStr", hideLabel: true },
+          {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "search", show: true},
+        ]
+      },
+      //因子表格相关
+      factorTableInfo: {
+        url: this.nozzle.sysEquipConfigList, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [],
+        fieldList: [
+          { label: "因子名称", value: "codeProperty", minWidth: 150, tooltip: true },
+          { label: "因子ASCII码", value: "codeAscll", minWidth: 100, tooltip: true },
+          { label: "水文编号", value: "code", minWidth: 100, tooltip: true },
+          { label: "因子最大值", value: "maxValue", minWidth: 100, tooltip: true },
+          { label: "因子最小值", value: "minValue", minWidth: 100, tooltip: true },
+          { label: "因子单位", value: "unit", minWidth: 100, tooltip: true },
+        ]
+      }
+    }
+  },
+  mounted() {
+    this.factorTableInfo.refresh = Math.random();
+  },
+  methods: {
+    //点击事件
+    handleClick(event, data) {
+      switch (event) {
+        //设备搜索
+        case "search":
+          this.factorTableInfo.initCurpage = Math.random();
+          this.factorTableInfo.refresh = Math.random();
+          break;
+      }
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index 065f3da..31253a6 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -35,6 +35,7 @@
     </div>
     <!--弹窗-->
     <el-dialog
+      class="page-data-dialog"
       :width="dialogInfo.width"
       append-to-body
       :title="dialogInfo.title[dialogInfo.type]"
@@ -55,9 +56,10 @@
         </div>
         <div class="page-content">
           <el-row :gutter="20" class="h-100">
-            <el-col :span="10" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">未关联站点列表</div>
               <page-table
-                tabIndex
+                class="flex-1"
                 checkBox
                 pagination
                 type="unRelate"
@@ -91,9 +93,10 @@
                 >
               </div>
             </el-col>
-            <el-col :span="10" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">已关联站点列表</div>
               <page-table
-                tabIndex
+                class="flex-1"
                 checkBox
                 pagination
                 type="isRelate"
@@ -244,8 +247,8 @@
           {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: "searchProject", show: true},
-          {type: "button", label: "添加项目", btType: "primary", icon: "", event: "create", show: true, has: "m11-1-4"}
+          {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "searchProject", show: true},
+          {type: "button", label: "添加项目", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-1-4"}
         ]
       },
       //项目表格相关
@@ -269,7 +272,7 @@
           width: "240",
           btList: [
             { label: "分配权限", size: "small", type: "text", event: "permission", show: true, has: 'm11-1-1' },
-            { label: "项目关联站点", size: "small", type: "text", event: "relate", show: true, has: 'm11-1-2' },
+            { label: "关联站点", size: "small", type: "text", event: "relate", show: true, has: 'm11-1-2' },
             { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-1-3' },
             { label: "删除", size: "small", type: "text", event: "delete", show: true, has: 'm11-1-5' }
           ]
@@ -329,10 +332,9 @@
         xmlxList: [{ key: "合同项目", value: "0" }, { key: "临测项目", value: "1" }],
         groupList: [],
         deptTree: [],
-        roleTree: [],
         userType: [{ key: "普通用户", value: 0 }, { key: "超级管理员", value: 1 }],
         statusList: [{ key: "未管理", value: 0 }, { key: "管理中", value: 1 }],
-        roleList: [{ key: "111", value: 0 }, { key: "2222", value: 1 }],
+        roleList: [],
       },
       //用户弹窗相关
       userDialogInfo: {
@@ -679,7 +681,6 @@
           this.dialogInfo.visible = true;
           this.dialogInfo.type = event;
           this.listTypeInfo.deptTree = this.allDept;
-          this.listTypeInfo.roleTree = this.allRole;
           this.needHandleProjectId = data.platformCode;
           this.permissionFilterInfo.query.platformCode = data.platformCode;
           setTimeout(() => {
@@ -1005,14 +1006,16 @@
   .el-dialog__body {
     @include fd();
     flex: 1;
-    padding: 20px;
+    padding-bottom: 0;
     overflow-y: auto;
   }
-  .el-pagination__sizes,
-  .el-pagination__total,
-  .el-pagination__jump {
-    display: none;
-  }
+}
+.table-title{
+  @include hl(30px,30px);
+  color: #409EFF;
+  text-align: center;
+  font-size: 16px;
+  margin-bottom: 10px;
 }
 .userDialog {
   /deep/ .el-form-item {
diff --git a/src/components/common/PageFilter/index.vue b/src/components/common/PageFilter/index.vue
index a4e93b0..614a410 100644
--- a/src/components/common/PageFilter/index.vue
+++ b/src/components/common/PageFilter/index.vue
@@ -238,4 +238,7 @@
       z-index: 10;
     }
   }
+  /deep/ .el-icon-date:before{
+    color: #fff;
+  }
 </style>
diff --git a/src/components/common/PageForm/index.vue b/src/components/common/PageForm/index.vue
index ddbc8e0..10915fa 100644
--- a/src/components/common/PageForm/index.vue
+++ b/src/components/common/PageForm/index.vue
@@ -243,12 +243,6 @@
         }
       },
       deep: true, // 深度监听
-    },
-    rules: {
-      handler(newVal, oldVal) {
-        console.log(6666,newVal, oldVal);
-      },
-      deep: true,
     }
   },
   mounted () {
@@ -362,6 +356,9 @@
     .el-form-item__label{
       text-align: right !important;
     }
+    .el-icon-date:before{
+      color: #fff;
+    }
   }
   /deep/ .el-form-block{
     width: 100%;

diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index b4e4a8f..440a79e 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -78,6 +78,15 @@
   background: transparent;
 }
 /****页面通用样式****/
+.flex{
+  display: flex;
+}
+.flex-1{
+  flex: 1;
+}
+.flex-d{
+  flex-direction: column;
+}
 .page-data {
   display: flex;
   flex-direction: column;
@@ -108,10 +117,10 @@
   flex-direction: column;
   flex: 1;
   padding: 20px;
+  padding-bottom: 0 !important;
   overflow-y: auto;
 }
 .page-data-dialog .el-pagination__sizes,
-.page-data-dialog .el-pagination__total,
 .page-data-dialog .el-pagination__jump{
-  display: none;
+  display: none !important;
 }
\ No newline at end of file
diff --git a/src/assets/css/mixin.css b/src/assets/css/mixin.css
deleted file mode 100644
index 9e97d02..0000000
--- a/src/assets/css/mixin.css
+++ /dev/null
@@ -1 +0,0 @@
-/* No CSS *//*# sourceMappingURL=mixin.css.map */
\ No newline at end of file
diff --git a/src/assets/css/mixin.css.map b/src/assets/css/mixin.css.map
deleted file mode 100644
index 356f200..0000000
--- a/src/assets/css/mixin.css.map
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "version": 3,
-    "mappings": "",
-    "sources": [
-        "mixin.scss"
-    ],
-    "names": [],
-    "file": "mixin.css"
-}
\ No newline at end of file
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 219a678..281044c 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -1,107 +1,37 @@
 <template>
-  <div id="pagetwo">
-    <div class="form">
-      <el-input
-        v-model="searchStr"
-        placeholder="请输入站点编号或站点名称"
-        clearable
-        @change="handleChangeSearch"
-      ></el-input>
-      <el-date-picker
-        v-model="startDate"
-        value-format="yyyy-MM-dd"
-        :picker-options="pickerOptionsStart"
-        type="date"
-        :clearable="true"
-        placeholder="请选择开始日期"
+  <div id="pagetwo" class="page-data">
+    <!--搜素框-->
+    <div class="page-filter">
+      <page-filter
+        :query.sync="siteFilterInfo.query"
+        :filter-list="siteFilterInfo.list"
+        @handleClick="handleClick"
       />
-      <el-date-picker
-        v-model="endDate"
-        value-format="yyyy-MM-dd"
-        :picker-options="pickerOptionsEnd"
-        type="date"
-        :clearable="true"
-        placeholder="请选择结束日期"
-      />
-      <el-button
-        type="primary"
-        icon="el-icon-search"
-        @click="search"
-        v-has="'Search'"
-        >查询</el-button
-      >
-      <el-button
-        type="primary"
-        icon="el-icon-circle-plus-outline"
-        @click="addform('ruleForm')"
-        v-has="'m11-2-1'"
-        >添加站点</el-button
-      >
     </div>
-
-    <el-table :data="listExtend" style="width: 100%; height: calc(100% - 82px)">
-      <el-table-column
-        type="index"
-        label="序号"
-        width="70"
-      ></el-table-column>
-      <el-table-column
-        prop="stCode"
-        label="站点编号"
-        max-width="120"
-        show-overflow-tooltip
-      ></el-table-column>
-      <el-table-column
-        prop="stName"
-        label="站点名称"
-        show-overflow-tooltip
-        max-width="150"
-      ></el-table-column>
-      <el-table-column label="站点类型" width="120">
-        <template slot-scope="scope">
-          <div>
-            <span v-if="scope.row.stationType == 0">水质站</span>
-            <span v-if="scope.row.stationType == 1">水位站</span>
-            <span v-if="scope.row.stationType == 2">流量站</span>
-          </div>
-        </template></el-table-column
-      >
-      <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"
-            size="small"
-            @click="EditFZ(scope.$index, scope.row)"
-            style="margin: 0 10px"
-            v-has="'m11-2-2'"
-            >修改</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
+    <div class="page-content">
+      <!--表格-->
+      <div class="h-100">
+        <page-table
+          tabIndex
+          pagination
+          :api-url="siteTableInfo.url"
+          :refresh="siteTableInfo.refresh"
+          :data.sync="siteTableInfo.data"
+          :query="siteFilterInfo.query"
+          :page-query="siteTableInfo.pageQuery"
+          :list-type-info="listTypeInfo"
+          :init-curpage="siteTableInfo.initCurpage"
+          :field-list="siteTableInfo.fieldList"
+          :handle="siteTableInfo.handle"
+          @handleClick="handleClick"
+        >
+          <!-- 自定义插槽显示状态 -->
+          <template v-slot:col-equips="scope">
+            <el-button type="text" size="small" @click="handleClick('look',scope.row)">查看设备</el-button>
+          </template>
+        </page-table>
+      </div>
+    </div>
 
     <!-- 新增/修改的弹出框 -->
     <el-dialog
@@ -266,72 +196,138 @@
       class="page-data-dialog"
       :title="dialogInfo.title[dialogInfo.type]"
       :visible.sync="dialogInfo.visible"
-      :width="dialogInfo.width"
+      width="80%"
       :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"
-      />
+      <template v-if="dialogInfo.type === 'look'">
+        <div class="page-filter">
+          <el-form :inline="true" :model="deviceRelatedQuery" ref="deviceRelatedQuery" size="medium">
+            <el-form-item label="">
+              <el-input v-model="deviceRelatedQuery.searchStr" placeholder="请输入设备编号/厂家" clearable></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="medium" @click="handleClick('deviceSearch')">查询</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="page-content">
+          <el-row :gutter="20" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">未关联设备列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="unRelated"
+                :api-url="deviceTableInfo.url"
+                :refresh="deviceTableInfo.refresh"
+                :data.sync="unRelatedDeviceTableInfo.data"
+                :query="unRelatedDeviceTableInfo.query"
+                :init-curpage="deviceTableInfo.initCurpage"
+                :field-list="deviceTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+            <el-col :span="4" class="h-100">
+              <div class="btn-group">
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-right"
+                  :disabled="isCanInsertDevice"
+                  @click="handleClick('insert')"
+                  >添加</el-button
+                >
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-left"
+                  :disabled="isCanRemoveDevice"
+                  @click="handleClick('remove')"
+                  >移除</el-button
+                >
+              </div>
+            </el-col>
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">已关联设备列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="isRelated"
+                :api-url="deviceTableInfo.url"
+                :refresh="deviceTableInfo.refresh"
+                :data.sync="isRelatedDeviceTableInfo.data"
+                :query="isRelatedDeviceTableInfo.query"
+                :init-curpage="deviceTableInfo.initCurpage"
+                :field-list="deviceTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+          </el-row>
+        </div>
+      </template>
     </page-dialog>
-    <el-pagination
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page="currentPage"
-      :page-sizes="[10, 20, 30, 40]"
-      :page-size="PageSize"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="AllTotal"
-    >
-    </el-pagination>
   </div>
 </template>
 <script>
 import axios from "axios";
-
+import { mapGetters } from "vuex";
 export default {
-  name: "StatisticalReport",
   data() {
     return {
+      //站点搜索相关
+      siteFilterInfo: {
+        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: "el-icon-search", event: "search", show: true},
+          {type: "button", label: "添加站点", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-2-1"}
+        ]
+      },
+      //站点表格相关
+      siteTableInfo: {
+        url: this.nozzle.listExtend, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [],
+        fieldList: [
+          { label: "站点编号", value: "stCode", minWidth: 120, tooltip: true },
+          { label: "站点名称", value: "stName", minWidth: 120, tooltip: true },
+          { label: "站点类型", value: "stationTypeName", width: 120 },
+          { label: "站点安装时间", value: "createTime", minWidth: 120, tooltip: true },
+          { label: "安装人", value: "person", width: 120 },
+          { label: "关联设备", value: "equips", width: 100, type: "slot" },
+          { label: "首次数据接入时间", value: "tt", minWidth: 120, tooltip: true },
+        ],
+        handle: {
+          fixed: "right",
+          label: "操作",
+          width: "80",
+          btList: [
+            { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-2-2' }
+          ]
+        }
+      },
+      //列表相关
+      listTypeInfo: {},
       loadingdelet: undefined,
       loading: false,
       timer: null,
       dialogImageUrl: "",
       dialogVisible: false,
-      PageSize: 10,
-      AllTotal: 0,
-      currentPage: 1,
       title: "站点管理",
-      listExtend: [], // 站点管理的返回数据
       siteTypeList: [], //弹框里面站点类型列表
-      searchStr: "",
-      file: [],
-      startDate: "",
-      endDate: "",
-      pickerOptionsStart: {
-        //结束时间不能大于开始时间
-        disabledDate: time => {
-          if (this.endDate) {
-            return time.getTime() > new Date(this.endDate).getTime();
-          }
-        }
-      },
-      pickerOptionsEnd: {
-        disabledDate: time => {
-          return time.getTime() < new Date(this.startDate).getTime();
-        }
-      },
-      List: [],
-      ledlist: [],
       yzaddflag: false,
       ruleForm: {
         id: "", //站点ID
@@ -431,7 +427,7 @@
       //弹窗相关
       dialogInfo:{
         title: {
-          look: '关联设备列表'
+          look: ''
         },
         width: '60%',
         visible: false,
@@ -441,65 +437,65 @@
           {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: '', //接口地址
+        url: this.nozzle.sysEquipRelatedList, //接口地址
         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: "",
+      //已关联设备表格相关
+      isRelatedDeviceTableInfo: {
+        data: [],
+        query: {
+          sign: ""
+        },
+        selectList: []
+      },
+      //未关联设备表格相关
+      unRelatedDeviceTableInfo: {
+        data: [],
+        query: {
+          sign: "unbound"
+        },
+        selectList: []
+      },
+      //设备关联过滤相关
+      deviceRelatedQuery: {
+        searchStr: "",
+        siteCode: ""
+      }
     };
   },
   mounted() {
-    this.getsyscityList();
-    this.getlistExtend();
+    this.siteTableInfo.refresh = Math.random();
     this.getsityType();
     this.getCurrentUserProject(); //获取当前用户所绑定的项目
   },
+  computed: {
+    //移除按钮是否可点击
+    isCanRemoveDevice() {
+      return this.isRelatedDeviceTableInfo.selectList.length ? false : true;
+    },
+    //添加按钮是否可点击
+    isCanInsertDevice() {
+      return this.unRelatedDeviceTableInfo.selectList.length ? false : true;
+    },
+    ...mapGetters(["allDept", "allRole", "allCity"])
+  },
   watch: {
     "ruleForm.area": {
       handler(newVal, oldVal) {
         if (this.$refs.cascader) {
           let children = this.$refs.cascader.getCheckedNodes();
-          // console.log(children);
           if (
             children.length &&
             children[0].children &&
             children[0].children.length < 1
           ) {
-            // console.log(9999);
             this.$refs.cascader.dropDownVisible = false;
           }
         }
@@ -516,30 +512,18 @@
     "dialogInfo.visible"(val) {
       if(!val) {
         this.deviceTableInfo.data = [];
+        this.deviceRelatedQuery.searchStr = "";
         this.dialogInfo.btLoading = false;
       }
+    },
+    "deviceRelatedQuery.searchStr"(val) {
+      Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+      Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
     }
   },
   methods: {
-    //将空的children置为undefined,避免在没有下一级数据的情况下显示暂无数据
-    removeEmptyChild(arr) {
-      arr.forEach(item => {
-        if (!item.children || item.children.length < 1) {
-          item.children = undefined;
-        } else {
-          this.removeEmptyChild(item.children);
-        }
-      });
-      return arr;
-    },
-    handleChangeSearch() {
-      this.currentPage = 1;
-      this.getlistExtend();
-    },
     //上传头像
     fileChange(file) {
-      // console.log(file.size, file.raw.type);
-      // const isJPG = file.raw.type === "image/jpeg";
       this.loading = true;
       const isLt1M = file.size / 1024 / 1024 < 1;
       if (file.raw.type != "image/jpeg" && file.raw.type != "image/png") {
@@ -559,25 +543,24 @@
       let config = {
         headers: { "Content-Type": "multipart/form-data" }
       };
-      axios
-        .post(this.nozzle.upload, formdata, config)
-        .then(res => {
-          if (res.data.code == 1) {
-            this.loading = false;
-            this.$message({
-              message: "上传图片成功！",
-              type: "success"
-            });
-            this.ruleForm.fileList.push(res.data.data[0]);
-          }
-        })
-        .catch(res => {
+      axios.post(this.nozzle.upload, formdata, config).then(res => {
+        if (res.data.code == 1) {
           this.loading = false;
           this.$message({
-            message: "服务器问题！请重试！",
-            type: "warning"
+            message: "上传图片成功！",
+            type: "success"
           });
+          this.ruleForm.fileList.push(res.data.data[0]);
+          this.siteTableInfo.refresh = Math.random();
+        }
+      })
+      .catch(res => {
+        this.loading = false;
+        this.$message({
+          message: "服务器问题！请重试！",
+          type: "warning"
         });
+      });
     },
     // 删除图片按钮
     deleteImg(fileNo) {
@@ -633,39 +616,24 @@
       this.dialogImageUrl = file.fileCloudStorageKey;
       this.dialogVisible = true;
     },
-    // 获取站点列表
-    async getlistExtend() {
-      const { data } = await this.$http.post(this.nozzle.listExtend, {
-        current: this.currentPage,
-        data: {
-          searchStr: this.searchStr,
-          startDate: this.startDate,
-          endDate: this.endDate
-        },
-        size: this.PageSize
-      });
-      this.listExtend = data.data.list;
-      this.AllTotal = data.data.total;
-    },
-    // 搜索查询按钮
-    search() {
-      this.currentPage = 1;
-      this.getlistExtend();
-    },
-    deleteRow(index, rows) {
-      rows.splice(index, 1);
-    },
     // 弹框提交表单按钮
     saveOru(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
-          this.$http
-            .post(this.nozzle.saveOrupdate, {
-              data: this.ruleForm
-            })
-            .then(res => {
+          this.$http.post(this.nozzle.saveOrupdate, {
+            data: this.ruleForm
+          })
+          .then(res => {
+            if(res.data.code === 1) {
+              this.siteTableInfo.refresh = Math.random();
               this.yzaddflag = false;
-            });
+            }
+            this.$message({
+              message: res.data.msg,
+              type: res.data.code === 1 ? 'success' : 'error',
+              showClose: true,
+            })
+          });
         }
       });
     },
@@ -674,7 +642,6 @@
       this.yzaddflag = false;
       this.$refs[formName].resetFields();
     },
-
     visiblechange(visible) {
       if (visible) {
         this.timer = setInterval(() => {
@@ -690,34 +657,6 @@
         clearInterval(this.timer);
       }
     },
-    // 添加站点
-    addform(formName) {
-      this.yzaddflag = true;
-      // 获取地区列表
-      this.title = "新增站点";
-    },
-    // 操作里面的修改弹窗
-    EditFZ(index, rows) {
-      // 获取地区列表
-      for (let key in rows) {
-        if (key === "stationType") {
-          rows[key] = rows[key].toString();
-        }
-        this.ruleForm[key] = rows[key];
-      }
-      this.yzaddflag = true;
-      this.title = "修改站点";
-      this.FenZuflag2type = 2;
-      this.AddFZInput = rows.groupName;
-      this.ClickID = rows.id;
-    },
-    // 获取地区列表数据
-    async getsyscityList() {
-      const { data } = await this.$http.post(this.nozzle.syscity);
-
-      let arr = this.removeEmptyChild(data.data);
-      this.syscityList = data.data;
-    },
     //获取站点类型列表
     async getsityType() {
       const { data } = await this.$http.post(this.nozzle.sityType, {
@@ -745,43 +684,98 @@
         }
       })
     },
+    //表格checkbox选择事件
+    handleEvent(event, data) {
+      switch (event) {
+        case "isRelated":
+          this.isRelatedDeviceTableInfo.selectList = data;
+          break;
+        case "unRelated":
+          this.unRelatedDeviceTableInfo.selectList = data;
+          break;
+      }
+    },
     //点击事件
     handleClick(event, data, index){
       switch(event) {
+        //站点搜索
+        case "search":
+          this.siteTableInfo.initCurpage = Math.random();
+          this.siteTableInfo.refresh = Math.random();
+          break;
+        //添加站点
+        case "create":
+          this.yzaddflag = true;
+          this.title = "新增站点";
+          this.syscityList = this.removeEmptyChild(this.allCity);
+          break;
+        //编辑站点
+        case "update":
+          this.title = "修改站点";
+          for (let key in data) {
+            if (key === "stationType") {
+              data[key] = data[key].toString();
+            }
+            this.ruleForm[key] = data[key];
+          }
+          this.syscityList = this.removeEmptyChild(this.allCity);
+          this.yzaddflag = true;
+          break;
         //查看关联设备
         case "look":
-          this.dialogInfo.visible = true;
           this.dialogInfo.type = event;
-          this.deviceTableInfo.data = data.equips;
-          this.needHandleSiteCode = data.stCode;
+          this.deviceRelatedQuery.siteCode = data.stCode;
+          this.dialogInfo.visible = true;
+          setTimeout(() => {
+            Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+            Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+            this.deviceTableInfo.refresh = Math.random();
+          }, 0);
+          break;
+        //关联设备搜索
+        case "deviceSearch":
+          this.deviceTableInfo.initCurpage = Math.random();
+          this.deviceTableInfo.refresh = Math.random();
+          break;
+        //添加设备到站点
+        case "insert":
+          const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map( item => item.equipNo);
+          const insertData = {
+            siteCode: this.unRelatedDeviceTableInfo.query.siteCode,
+            equipNos: insertEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipInsertBatch, { data: insertData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              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
+            });
+          });
           break;
         //解绑设备与站点
         case "remove":
-          this.$confirm("此操作将解除设备和站点的绑定关系, 是否继续?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(res =>{
-            const params = {
-              data: {
-                siteCode: this.needHandleSiteCode,
-                equipNos: [data.equipNo]
-              }
+          const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(item => item.equipNo);
+          const removeData = {
+            siteCode: this.isRelatedDeviceTableInfo.query.siteCode,
+            equipNos: removeEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipRemoveBatch, { data: removeData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              this.deviceTableInfo.refresh = Math.random();
+              this.deviceTableInfo.initCurpage = Math.random();
             }
-            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(() =>{})
+            this.$message({
+              message: res.data.msg,
+              type: res.data.code === 1 ? "success" : "error",
+              showClose: true
+            });
+          }).catch(e =>{console.log(e)});
           break;
         //关闭
         case "close":
@@ -820,19 +814,21 @@
       };
       this.$refs.cascader.$refs.panel.activePath = [];
       this.$refs.cascader.$refs.panel.clearCheckedNodes();
-      // this.getlistExtend();
     },
     handleChange(value) {
       // 取选中数组的最后一项的id
       this.ruleForm.area = value.slice(-1)[0];
     },
-    handleSizeChange(val) {
-      this.PageSize = val;
-      this.getlistExtend();
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getlistExtend();
+    //将空的children置为undefined,避免在没有下一级数据的情况下显示暂无数据
+    removeEmptyChild(arr) {
+      arr.forEach(item => {
+        if (!item.children || item.children.length < 1) {
+          item.children = undefined;
+        } else {
+          this.removeEmptyChild(item.children);
+        }
+      });
+      return arr;
     }
   },
   destroyed() {
@@ -841,15 +837,10 @@
 };
 </script>
 <style lang="scss" scoped>
-/deep/ .el-pagination .el-pager li.active {
-  background-color: #409eff !important;
-  cursor: default;
-}
 .imgtype {
   width: 150px;
   height: 100px;
 }
-
 /deep/ .el-upload-list {
   display: none;
 }
@@ -858,7 +849,6 @@
   margin: 0 20px 20px 0;
   position: relative;
 }
-
 .deleteSpan {
   position: absolute;
   display: inline-block;
@@ -893,26 +883,33 @@
   width: 200px;
   margin: 0 10px;
 }
-
-.title {
-  height: 50px;
-  line-height: 50px;
+.title, .table-title{
+  @include hl(30px,30px);
+  color: #409EFF;
   text-align: center;
   font-size: 16px;
+  margin-bottom: 10px;
 }
-
 .tableSection {
   padding: 10px;
   background: rgba(270, 255, 255, 0.05);
 }
 /deep/ .el-dialog .el-dialog__body {
   text-align: left;
+  padding-bottom: 0;
 }
-
 .el-dialog .selectInput {
   width: 30% !important;
 }
 .el-dialog .selectInput .el-select-dropdown__empty {
   width: 100% !important;
 }
+.btn-group {
+  height: 100%;
+  @include fdaj(center, center);
+  /deep/ .el-button + .el-button {
+    margin-left: 0;
+    margin-top: 10px;
+  }
+}
 </style>
diff --git a/src/components/ConfigManager/device.vue b/src/components/ConfigManager/device.vue
index f800811..bc4ccda 100644
--- a/src/components/ConfigManager/device.vue
+++ b/src/components/ConfigManager/device.vue
@@ -35,22 +35,97 @@
     </div>
     <!--弹窗-->
     <page-dialog
+      class="page-data-dialog"
       :title="dialogInfo.title[dialogInfo.type]"
       :visible.sync="dialogInfo.visible"
-      :width="dialogInfo.width"
+      :width="dialogInfo.type === 'relate' ? '80%' : '500px'"
       :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"
-      />
+      <!--关联因子-->
+      <template v-if="dialogInfo.type === 'relate'">
+        <div class="page-filter">
+          <el-form :inline="true" :model="factorQuery" ref="factorQuery" size="medium">
+            <el-form-item label="">
+              <el-input v-model="factorQuery.searchStr" placeholder="因子名称/ASCII码" clearable></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="medium" @click="handleClick('factorSearch')">查询</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="page-content">
+          <el-row :gutter="20" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">未关联因子列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="unRelated"
+                :api-url="factorTableInfo.url"
+                :refresh="factorTableInfo.refresh"
+                :data.sync="unRelatedFactorTableInfo.data"
+                :query="unRelatedFactorTableInfo.query"
+                :init-curpage="factorTableInfo.initCurpage"
+                :field-list="factorTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+            <el-col :span="4" class="h-100">
+              <div class="btn-group">
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-right"
+                  :disabled="isCanInsertFactor"
+                  @click="handleClick('insert')"
+                  >添加</el-button
+                >
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-left"
+                  :disabled="isCanRemoveFactor"
+                  @click="handleClick('remove')"
+                  >移除</el-button
+                >
+              </div>
+            </el-col>
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">已关联因子列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="isRelated"
+                :api-url="factorTableInfo.url"
+                :refresh="factorTableInfo.refresh"
+                :data.sync="isRelatedFactorTableInfo.data"
+                :query="isRelatedFactorTableInfo.query"
+                :init-curpage="factorTableInfo.initCurpage"
+                :field-list="factorTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+          </el-row>
+        </div>
+      </template>
+      <!--新增/修改表单-->
+      <template v-else>
+        <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"
+        />
+      </template>
     </page-dialog>
   </div>
 </template>
@@ -80,8 +155,8 @@
           {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"}
+          {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "search", show: true},
+          {type: "button", label: "添加设备", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-3-1"}
         ]
       },
       //设备表格相关
@@ -89,9 +164,7 @@
         url: this.nozzle.sysEquipList, //接口地址
         refresh: 1,
         initCurpage: 1,
-        data: [
-          {equipNo:1000,equipDesc:"3333",equipFactory:'4444'}
-        ],
+        data: [],
         fieldList: [
           { label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
           { label: "设备描述", value: "equipDesc", minWidth: 150, tooltip: true },
@@ -105,8 +178,9 @@
         handle: {
           fixed: "right",
           label: "操作",
-          width: "120",
+          width: "180",
           btList: [
+            { label: "关联因子", size: "small", type: "text", event: "relate", show: true, has: 'm11-3-4' },
             { 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' }
           ]
@@ -143,18 +217,60 @@
       //弹窗相关
       dialogInfo:{
         title: {
-          update: '编辑设备',
-          create: '添加设备'
+          update: "编辑设备",
+          create: "添加设备",
+          relate: "",
         },
-        width: '500px',
+        width: "500px",
         visible: false,
         btLoading: false,
-        type: '',
+        type: "",
         btList: [
-          {label:'关闭',type:'',icon:'',event:'close',show:true},
-          {label:'保存',type:'primary',icon:'',event:'save',show:true,loading:true}
+          {label:"关闭",type:"",icon:"",event:"close",show:true},
+          {label:"保存",type:"primary",icon:"",event:"save",show:true,loading:true}
         ]
       },
+      //因子表格通用相关
+      factorTableInfo: {
+        url: this.nozzle.sysEquipFactorList, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        fieldList: [
+          { label: "因子名称", value: "codeProperty", minWidth: 100, tooltip: true },
+          { label: "因子ASCII码", value: "codeAscll", minWidth: 100, tooltip: true },
+        ]
+      },
+      //已关联因子表格相关
+      isRelatedFactorTableInfo: {
+        data: [],
+        query: {
+          sign: ""
+        },
+        selectList: []
+      },
+      //未关联因子表格相关
+      unRelatedFactorTableInfo: {
+        data: [],
+        query: {
+          sign: "unbound"
+        },
+        selectList: []
+      },
+      //设备关联过滤相关
+      factorQuery: {
+        searchStr: "",
+        equipNo: ""
+      }
+    }
+  },
+  computed: {
+    //移除按钮是否可点击
+    isCanRemoveFactor() {
+      return this.isRelatedFactorTableInfo.selectList.length ? false : true;
+    },
+    //添加按钮是否可点击
+    isCanInsertFactor() {
+      return this.unRelatedFactorTableInfo.selectList.length ? false : true;
     }
   },
   watch: {
@@ -165,8 +281,20 @@
         }
         this.resetForm();
         this.btnLoading = false;
+        this.factorQuery.searchStr = "";
       }
     },
+    "dialogInfo.type"(val) {
+      this.dialogInfo.btList.forEach(item =>{
+        if(item.event === "save") {
+          item.show = val === "relate" ? false : true;
+        }
+      })
+    },
+    "factorQuery.searchStr"(val) {
+      Object.assign(this.isRelatedFactorTableInfo.query, this.factorQuery);
+      Object.assign(this.unRelatedFactorTableInfo.query, this.factorQuery);
+    }
   },
   created() {
     this.initSiteData();
@@ -198,6 +326,17 @@
         }
       })
     },
+    //表格checkbox选择事件
+    handleEvent(event, data) {
+      switch (event) {
+        case "isRelated":
+          this.isRelatedFactorTableInfo.selectList = data;
+          break;
+        case "unRelated":
+          this.unRelatedFactorTableInfo.selectList = data;
+          break;
+      }
+    },
     //点击事件
     handleClick(event, data) {
       switch (event) {
@@ -243,6 +382,62 @@
             })
           }).catch(() =>{})
           break;
+        //查看关联因子
+        case "relate":
+          this.dialogInfo.type = event;
+          this.factorQuery.equipNo = data.equipNo;
+          this.dialogInfo.visible = true;
+          setTimeout(() => {
+            Object.assign(this.isRelatedFactorTableInfo.query, this.factorQuery);
+            Object.assign(this.unRelatedFactorTableInfo.query, this.factorQuery);
+            this.factorTableInfo.refresh = Math.random();
+          }, 0);
+          break;
+        //关联因子搜索
+        case "factorSearch":
+          this.factorTableInfo.initCurpage = Math.random();
+          this.factorTableInfo.refresh = Math.random();
+          break;
+        //添加因子到站点
+        case "insert":
+          const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map( item => item.equipNo);
+          const insertData = {
+            siteCode: this.unRelatedDeviceTableInfo.query.siteCode,
+            equipNos: insertEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipInsertBatch, { data: insertData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              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
+            });
+          });
+          break;
+        //解绑因子与站点
+        case "remove":
+          const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(item => item.equipNo);
+          const removeData = {
+            siteCode: this.isRelatedDeviceTableInfo.query.siteCode,
+            equipNos: removeEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipRemoveBatch, { data: removeData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              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 =>{console.log(e)});
+          break;
         //关闭
         case "close":
           setTimeout(() => {
@@ -294,4 +489,22 @@
     },
   }
 }
-</script>
\ No newline at end of file
+</script>
+
+<style lang="scss" scoped>
+.table-title{
+  @include hl(30px,30px);
+  color: #409EFF;
+  text-align: center;
+  font-size: 16px;
+  margin-bottom: 10px;
+}
+.btn-group {
+  height: 100%;
+  @include fdaj(center, center);
+  /deep/ .el-button + .el-button {
+    margin-left: 0;
+    margin-top: 10px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/ConfigManager/factor.vue b/src/components/ConfigManager/factor.vue
new file mode 100644
index 0000000..f38f0b9
--- /dev/null
+++ b/src/components/ConfigManager/factor.vue
@@ -0,0 +1,79 @@
+<template>
+  <div class="page-data">
+    <!--搜素框-->
+    <div class="page-filter">
+      <page-filter
+        :query.sync="factorFilterInfo.query"
+        :filter-list="factorFilterInfo.list"
+        @handleClick="handleClick"
+      />
+    </div>
+    <div class="page-content">
+      <!--表格-->
+      <div class="h-100">
+        <page-table
+          tabIndex
+          pagination
+          :api-url="factorTableInfo.url"
+          :refresh="factorTableInfo.refresh"
+          :data.sync="factorTableInfo.data"
+          :query="factorFilterInfo.query"
+          :page-query="factorTableInfo.pageQuery"
+          :init-curpage="factorTableInfo.initCurpage"
+          :field-list="factorTableInfo.fieldList"
+          @handleClick="handleClick"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { message } from "./../../util/item";
+export default {
+  data() {
+    return {
+      //因子搜索相关
+      factorFilterInfo: {
+        query: {
+          searchStr: "",
+        },
+        list: [
+          {type: "input", label: "因子名称/ASCII码", value: "searchStr", hideLabel: true },
+          {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "search", show: true},
+        ]
+      },
+      //因子表格相关
+      factorTableInfo: {
+        url: this.nozzle.sysEquipConfigList, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [],
+        fieldList: [
+          { label: "因子名称", value: "codeProperty", minWidth: 150, tooltip: true },
+          { label: "因子ASCII码", value: "codeAscll", minWidth: 100, tooltip: true },
+          { label: "水文编号", value: "code", minWidth: 100, tooltip: true },
+          { label: "因子最大值", value: "maxValue", minWidth: 100, tooltip: true },
+          { label: "因子最小值", value: "minValue", minWidth: 100, tooltip: true },
+          { label: "因子单位", value: "unit", minWidth: 100, tooltip: true },
+        ]
+      }
+    }
+  },
+  mounted() {
+    this.factorTableInfo.refresh = Math.random();
+  },
+  methods: {
+    //点击事件
+    handleClick(event, data) {
+      switch (event) {
+        //设备搜索
+        case "search":
+          this.factorTableInfo.initCurpage = Math.random();
+          this.factorTableInfo.refresh = Math.random();
+          break;
+      }
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index 065f3da..31253a6 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -35,6 +35,7 @@
     </div>
     <!--弹窗-->
     <el-dialog
+      class="page-data-dialog"
       :width="dialogInfo.width"
       append-to-body
       :title="dialogInfo.title[dialogInfo.type]"
@@ -55,9 +56,10 @@
         </div>
         <div class="page-content">
           <el-row :gutter="20" class="h-100">
-            <el-col :span="10" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">未关联站点列表</div>
               <page-table
-                tabIndex
+                class="flex-1"
                 checkBox
                 pagination
                 type="unRelate"
@@ -91,9 +93,10 @@
                 >
               </div>
             </el-col>
-            <el-col :span="10" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">已关联站点列表</div>
               <page-table
-                tabIndex
+                class="flex-1"
                 checkBox
                 pagination
                 type="isRelate"
@@ -244,8 +247,8 @@
           {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: "searchProject", show: true},
-          {type: "button", label: "添加项目", btType: "primary", icon: "", event: "create", show: true, has: "m11-1-4"}
+          {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "searchProject", show: true},
+          {type: "button", label: "添加项目", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-1-4"}
         ]
       },
       //项目表格相关
@@ -269,7 +272,7 @@
           width: "240",
           btList: [
             { label: "分配权限", size: "small", type: "text", event: "permission", show: true, has: 'm11-1-1' },
-            { label: "项目关联站点", size: "small", type: "text", event: "relate", show: true, has: 'm11-1-2' },
+            { label: "关联站点", size: "small", type: "text", event: "relate", show: true, has: 'm11-1-2' },
             { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-1-3' },
             { label: "删除", size: "small", type: "text", event: "delete", show: true, has: 'm11-1-5' }
           ]
@@ -329,10 +332,9 @@
         xmlxList: [{ key: "合同项目", value: "0" }, { key: "临测项目", value: "1" }],
         groupList: [],
         deptTree: [],
-        roleTree: [],
         userType: [{ key: "普通用户", value: 0 }, { key: "超级管理员", value: 1 }],
         statusList: [{ key: "未管理", value: 0 }, { key: "管理中", value: 1 }],
-        roleList: [{ key: "111", value: 0 }, { key: "2222", value: 1 }],
+        roleList: [],
       },
       //用户弹窗相关
       userDialogInfo: {
@@ -679,7 +681,6 @@
           this.dialogInfo.visible = true;
           this.dialogInfo.type = event;
           this.listTypeInfo.deptTree = this.allDept;
-          this.listTypeInfo.roleTree = this.allRole;
           this.needHandleProjectId = data.platformCode;
           this.permissionFilterInfo.query.platformCode = data.platformCode;
           setTimeout(() => {
@@ -1005,14 +1006,16 @@
   .el-dialog__body {
     @include fd();
     flex: 1;
-    padding: 20px;
+    padding-bottom: 0;
     overflow-y: auto;
   }
-  .el-pagination__sizes,
-  .el-pagination__total,
-  .el-pagination__jump {
-    display: none;
-  }
+}
+.table-title{
+  @include hl(30px,30px);
+  color: #409EFF;
+  text-align: center;
+  font-size: 16px;
+  margin-bottom: 10px;
 }
 .userDialog {
   /deep/ .el-form-item {
diff --git a/src/components/common/PageFilter/index.vue b/src/components/common/PageFilter/index.vue
index a4e93b0..614a410 100644
--- a/src/components/common/PageFilter/index.vue
+++ b/src/components/common/PageFilter/index.vue
@@ -238,4 +238,7 @@
       z-index: 10;
     }
   }
+  /deep/ .el-icon-date:before{
+    color: #fff;
+  }
 </style>
diff --git a/src/components/common/PageForm/index.vue b/src/components/common/PageForm/index.vue
index ddbc8e0..10915fa 100644
--- a/src/components/common/PageForm/index.vue
+++ b/src/components/common/PageForm/index.vue
@@ -243,12 +243,6 @@
         }
       },
       deep: true, // 深度监听
-    },
-    rules: {
-      handler(newVal, oldVal) {
-        console.log(6666,newVal, oldVal);
-      },
-      deep: true,
     }
   },
   mounted () {
@@ -362,6 +356,9 @@
     .el-form-item__label{
       text-align: right !important;
     }
+    .el-icon-date:before{
+      color: #fff;
+    }
   }
   /deep/ .el-form-block{
     width: 100%;
diff --git a/src/components/common/PageTable/index.vue b/src/components/common/PageTable/index.vue
index 0536b03..b992a54 100644
--- a/src/components/common/PageTable/index.vue
+++ b/src/components/common/PageTable/index.vue
@@ -102,7 +102,7 @@
         layout="total, sizes, prev, pager, next, jumper"
         :total="listInfo.total"
         :pager-count="5"
-        :page-sizes="[10, 50, 100, 500, 1000]"
+        :page-sizes="[10, 20, 30, 40]"
         :page-size="listInfo.query.size"
         :current-page.sync="listInfo.query.current"
         @current-change="handleCurrentChange"

diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index b4e4a8f..440a79e 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -78,6 +78,15 @@
   background: transparent;
 }
 /****页面通用样式****/
+.flex{
+  display: flex;
+}
+.flex-1{
+  flex: 1;
+}
+.flex-d{
+  flex-direction: column;
+}
 .page-data {
   display: flex;
   flex-direction: column;
@@ -108,10 +117,10 @@
   flex-direction: column;
   flex: 1;
   padding: 20px;
+  padding-bottom: 0 !important;
   overflow-y: auto;
 }
 .page-data-dialog .el-pagination__sizes,
-.page-data-dialog .el-pagination__total,
 .page-data-dialog .el-pagination__jump{
-  display: none;
+  display: none !important;
 }
\ No newline at end of file
diff --git a/src/assets/css/mixin.css b/src/assets/css/mixin.css
deleted file mode 100644
index 9e97d02..0000000
--- a/src/assets/css/mixin.css
+++ /dev/null
@@ -1 +0,0 @@
-/* No CSS *//*# sourceMappingURL=mixin.css.map */
\ No newline at end of file
diff --git a/src/assets/css/mixin.css.map b/src/assets/css/mixin.css.map
deleted file mode 100644
index 356f200..0000000
--- a/src/assets/css/mixin.css.map
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "version": 3,
-    "mappings": "",
-    "sources": [
-        "mixin.scss"
-    ],
-    "names": [],
-    "file": "mixin.css"
-}
\ No newline at end of file
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 219a678..281044c 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -1,107 +1,37 @@
 <template>
-  <div id="pagetwo">
-    <div class="form">
-      <el-input
-        v-model="searchStr"
-        placeholder="请输入站点编号或站点名称"
-        clearable
-        @change="handleChangeSearch"
-      ></el-input>
-      <el-date-picker
-        v-model="startDate"
-        value-format="yyyy-MM-dd"
-        :picker-options="pickerOptionsStart"
-        type="date"
-        :clearable="true"
-        placeholder="请选择开始日期"
+  <div id="pagetwo" class="page-data">
+    <!--搜素框-->
+    <div class="page-filter">
+      <page-filter
+        :query.sync="siteFilterInfo.query"
+        :filter-list="siteFilterInfo.list"
+        @handleClick="handleClick"
       />
-      <el-date-picker
-        v-model="endDate"
-        value-format="yyyy-MM-dd"
-        :picker-options="pickerOptionsEnd"
-        type="date"
-        :clearable="true"
-        placeholder="请选择结束日期"
-      />
-      <el-button
-        type="primary"
-        icon="el-icon-search"
-        @click="search"
-        v-has="'Search'"
-        >查询</el-button
-      >
-      <el-button
-        type="primary"
-        icon="el-icon-circle-plus-outline"
-        @click="addform('ruleForm')"
-        v-has="'m11-2-1'"
-        >添加站点</el-button
-      >
     </div>
-
-    <el-table :data="listExtend" style="width: 100%; height: calc(100% - 82px)">
-      <el-table-column
-        type="index"
-        label="序号"
-        width="70"
-      ></el-table-column>
-      <el-table-column
-        prop="stCode"
-        label="站点编号"
-        max-width="120"
-        show-overflow-tooltip
-      ></el-table-column>
-      <el-table-column
-        prop="stName"
-        label="站点名称"
-        show-overflow-tooltip
-        max-width="150"
-      ></el-table-column>
-      <el-table-column label="站点类型" width="120">
-        <template slot-scope="scope">
-          <div>
-            <span v-if="scope.row.stationType == 0">水质站</span>
-            <span v-if="scope.row.stationType == 1">水位站</span>
-            <span v-if="scope.row.stationType == 2">流量站</span>
-          </div>
-        </template></el-table-column
-      >
-      <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"
-            size="small"
-            @click="EditFZ(scope.$index, scope.row)"
-            style="margin: 0 10px"
-            v-has="'m11-2-2'"
-            >修改</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
+    <div class="page-content">
+      <!--表格-->
+      <div class="h-100">
+        <page-table
+          tabIndex
+          pagination
+          :api-url="siteTableInfo.url"
+          :refresh="siteTableInfo.refresh"
+          :data.sync="siteTableInfo.data"
+          :query="siteFilterInfo.query"
+          :page-query="siteTableInfo.pageQuery"
+          :list-type-info="listTypeInfo"
+          :init-curpage="siteTableInfo.initCurpage"
+          :field-list="siteTableInfo.fieldList"
+          :handle="siteTableInfo.handle"
+          @handleClick="handleClick"
+        >
+          <!-- 自定义插槽显示状态 -->
+          <template v-slot:col-equips="scope">
+            <el-button type="text" size="small" @click="handleClick('look',scope.row)">查看设备</el-button>
+          </template>
+        </page-table>
+      </div>
+    </div>
 
     <!-- 新增/修改的弹出框 -->
     <el-dialog
@@ -266,72 +196,138 @@
       class="page-data-dialog"
       :title="dialogInfo.title[dialogInfo.type]"
       :visible.sync="dialogInfo.visible"
-      :width="dialogInfo.width"
+      width="80%"
       :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"
-      />
+      <template v-if="dialogInfo.type === 'look'">
+        <div class="page-filter">
+          <el-form :inline="true" :model="deviceRelatedQuery" ref="deviceRelatedQuery" size="medium">
+            <el-form-item label="">
+              <el-input v-model="deviceRelatedQuery.searchStr" placeholder="请输入设备编号/厂家" clearable></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="medium" @click="handleClick('deviceSearch')">查询</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="page-content">
+          <el-row :gutter="20" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">未关联设备列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="unRelated"
+                :api-url="deviceTableInfo.url"
+                :refresh="deviceTableInfo.refresh"
+                :data.sync="unRelatedDeviceTableInfo.data"
+                :query="unRelatedDeviceTableInfo.query"
+                :init-curpage="deviceTableInfo.initCurpage"
+                :field-list="deviceTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+            <el-col :span="4" class="h-100">
+              <div class="btn-group">
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-right"
+                  :disabled="isCanInsertDevice"
+                  @click="handleClick('insert')"
+                  >添加</el-button
+                >
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-left"
+                  :disabled="isCanRemoveDevice"
+                  @click="handleClick('remove')"
+                  >移除</el-button
+                >
+              </div>
+            </el-col>
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">已关联设备列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="isRelated"
+                :api-url="deviceTableInfo.url"
+                :refresh="deviceTableInfo.refresh"
+                :data.sync="isRelatedDeviceTableInfo.data"
+                :query="isRelatedDeviceTableInfo.query"
+                :init-curpage="deviceTableInfo.initCurpage"
+                :field-list="deviceTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+          </el-row>
+        </div>
+      </template>
     </page-dialog>
-    <el-pagination
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page="currentPage"
-      :page-sizes="[10, 20, 30, 40]"
-      :page-size="PageSize"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="AllTotal"
-    >
-    </el-pagination>
   </div>
 </template>
 <script>
 import axios from "axios";
-
+import { mapGetters } from "vuex";
 export default {
-  name: "StatisticalReport",
   data() {
     return {
+      //站点搜索相关
+      siteFilterInfo: {
+        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: "el-icon-search", event: "search", show: true},
+          {type: "button", label: "添加站点", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-2-1"}
+        ]
+      },
+      //站点表格相关
+      siteTableInfo: {
+        url: this.nozzle.listExtend, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [],
+        fieldList: [
+          { label: "站点编号", value: "stCode", minWidth: 120, tooltip: true },
+          { label: "站点名称", value: "stName", minWidth: 120, tooltip: true },
+          { label: "站点类型", value: "stationTypeName", width: 120 },
+          { label: "站点安装时间", value: "createTime", minWidth: 120, tooltip: true },
+          { label: "安装人", value: "person", width: 120 },
+          { label: "关联设备", value: "equips", width: 100, type: "slot" },
+          { label: "首次数据接入时间", value: "tt", minWidth: 120, tooltip: true },
+        ],
+        handle: {
+          fixed: "right",
+          label: "操作",
+          width: "80",
+          btList: [
+            { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-2-2' }
+          ]
+        }
+      },
+      //列表相关
+      listTypeInfo: {},
       loadingdelet: undefined,
       loading: false,
       timer: null,
       dialogImageUrl: "",
       dialogVisible: false,
-      PageSize: 10,
-      AllTotal: 0,
-      currentPage: 1,
       title: "站点管理",
-      listExtend: [], // 站点管理的返回数据
       siteTypeList: [], //弹框里面站点类型列表
-      searchStr: "",
-      file: [],
-      startDate: "",
-      endDate: "",
-      pickerOptionsStart: {
-        //结束时间不能大于开始时间
-        disabledDate: time => {
-          if (this.endDate) {
-            return time.getTime() > new Date(this.endDate).getTime();
-          }
-        }
-      },
-      pickerOptionsEnd: {
-        disabledDate: time => {
-          return time.getTime() < new Date(this.startDate).getTime();
-        }
-      },
-      List: [],
-      ledlist: [],
       yzaddflag: false,
       ruleForm: {
         id: "", //站点ID
@@ -431,7 +427,7 @@
       //弹窗相关
       dialogInfo:{
         title: {
-          look: '关联设备列表'
+          look: ''
         },
         width: '60%',
         visible: false,
@@ -441,65 +437,65 @@
           {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: '', //接口地址
+        url: this.nozzle.sysEquipRelatedList, //接口地址
         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: "",
+      //已关联设备表格相关
+      isRelatedDeviceTableInfo: {
+        data: [],
+        query: {
+          sign: ""
+        },
+        selectList: []
+      },
+      //未关联设备表格相关
+      unRelatedDeviceTableInfo: {
+        data: [],
+        query: {
+          sign: "unbound"
+        },
+        selectList: []
+      },
+      //设备关联过滤相关
+      deviceRelatedQuery: {
+        searchStr: "",
+        siteCode: ""
+      }
     };
   },
   mounted() {
-    this.getsyscityList();
-    this.getlistExtend();
+    this.siteTableInfo.refresh = Math.random();
     this.getsityType();
     this.getCurrentUserProject(); //获取当前用户所绑定的项目
   },
+  computed: {
+    //移除按钮是否可点击
+    isCanRemoveDevice() {
+      return this.isRelatedDeviceTableInfo.selectList.length ? false : true;
+    },
+    //添加按钮是否可点击
+    isCanInsertDevice() {
+      return this.unRelatedDeviceTableInfo.selectList.length ? false : true;
+    },
+    ...mapGetters(["allDept", "allRole", "allCity"])
+  },
   watch: {
     "ruleForm.area": {
       handler(newVal, oldVal) {
         if (this.$refs.cascader) {
           let children = this.$refs.cascader.getCheckedNodes();
-          // console.log(children);
           if (
             children.length &&
             children[0].children &&
             children[0].children.length < 1
           ) {
-            // console.log(9999);
             this.$refs.cascader.dropDownVisible = false;
           }
         }
@@ -516,30 +512,18 @@
     "dialogInfo.visible"(val) {
       if(!val) {
         this.deviceTableInfo.data = [];
+        this.deviceRelatedQuery.searchStr = "";
         this.dialogInfo.btLoading = false;
       }
+    },
+    "deviceRelatedQuery.searchStr"(val) {
+      Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+      Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
     }
   },
   methods: {
-    //将空的children置为undefined,避免在没有下一级数据的情况下显示暂无数据
-    removeEmptyChild(arr) {
-      arr.forEach(item => {
-        if (!item.children || item.children.length < 1) {
-          item.children = undefined;
-        } else {
-          this.removeEmptyChild(item.children);
-        }
-      });
-      return arr;
-    },
-    handleChangeSearch() {
-      this.currentPage = 1;
-      this.getlistExtend();
-    },
     //上传头像
     fileChange(file) {
-      // console.log(file.size, file.raw.type);
-      // const isJPG = file.raw.type === "image/jpeg";
       this.loading = true;
       const isLt1M = file.size / 1024 / 1024 < 1;
       if (file.raw.type != "image/jpeg" && file.raw.type != "image/png") {
@@ -559,25 +543,24 @@
       let config = {
         headers: { "Content-Type": "multipart/form-data" }
       };
-      axios
-        .post(this.nozzle.upload, formdata, config)
-        .then(res => {
-          if (res.data.code == 1) {
-            this.loading = false;
-            this.$message({
-              message: "上传图片成功！",
-              type: "success"
-            });
-            this.ruleForm.fileList.push(res.data.data[0]);
-          }
-        })
-        .catch(res => {
+      axios.post(this.nozzle.upload, formdata, config).then(res => {
+        if (res.data.code == 1) {
           this.loading = false;
           this.$message({
-            message: "服务器问题！请重试！",
-            type: "warning"
+            message: "上传图片成功！",
+            type: "success"
           });
+          this.ruleForm.fileList.push(res.data.data[0]);
+          this.siteTableInfo.refresh = Math.random();
+        }
+      })
+      .catch(res => {
+        this.loading = false;
+        this.$message({
+          message: "服务器问题！请重试！",
+          type: "warning"
         });
+      });
     },
     // 删除图片按钮
     deleteImg(fileNo) {
@@ -633,39 +616,24 @@
       this.dialogImageUrl = file.fileCloudStorageKey;
       this.dialogVisible = true;
     },
-    // 获取站点列表
-    async getlistExtend() {
-      const { data } = await this.$http.post(this.nozzle.listExtend, {
-        current: this.currentPage,
-        data: {
-          searchStr: this.searchStr,
-          startDate: this.startDate,
-          endDate: this.endDate
-        },
-        size: this.PageSize
-      });
-      this.listExtend = data.data.list;
-      this.AllTotal = data.data.total;
-    },
-    // 搜索查询按钮
-    search() {
-      this.currentPage = 1;
-      this.getlistExtend();
-    },
-    deleteRow(index, rows) {
-      rows.splice(index, 1);
-    },
     // 弹框提交表单按钮
     saveOru(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
-          this.$http
-            .post(this.nozzle.saveOrupdate, {
-              data: this.ruleForm
-            })
-            .then(res => {
+          this.$http.post(this.nozzle.saveOrupdate, {
+            data: this.ruleForm
+          })
+          .then(res => {
+            if(res.data.code === 1) {
+              this.siteTableInfo.refresh = Math.random();
               this.yzaddflag = false;
-            });
+            }
+            this.$message({
+              message: res.data.msg,
+              type: res.data.code === 1 ? 'success' : 'error',
+              showClose: true,
+            })
+          });
         }
       });
     },
@@ -674,7 +642,6 @@
       this.yzaddflag = false;
       this.$refs[formName].resetFields();
     },
-
     visiblechange(visible) {
       if (visible) {
         this.timer = setInterval(() => {
@@ -690,34 +657,6 @@
         clearInterval(this.timer);
       }
     },
-    // 添加站点
-    addform(formName) {
-      this.yzaddflag = true;
-      // 获取地区列表
-      this.title = "新增站点";
-    },
-    // 操作里面的修改弹窗
-    EditFZ(index, rows) {
-      // 获取地区列表
-      for (let key in rows) {
-        if (key === "stationType") {
-          rows[key] = rows[key].toString();
-        }
-        this.ruleForm[key] = rows[key];
-      }
-      this.yzaddflag = true;
-      this.title = "修改站点";
-      this.FenZuflag2type = 2;
-      this.AddFZInput = rows.groupName;
-      this.ClickID = rows.id;
-    },
-    // 获取地区列表数据
-    async getsyscityList() {
-      const { data } = await this.$http.post(this.nozzle.syscity);
-
-      let arr = this.removeEmptyChild(data.data);
-      this.syscityList = data.data;
-    },
     //获取站点类型列表
     async getsityType() {
       const { data } = await this.$http.post(this.nozzle.sityType, {
@@ -745,43 +684,98 @@
         }
       })
     },
+    //表格checkbox选择事件
+    handleEvent(event, data) {
+      switch (event) {
+        case "isRelated":
+          this.isRelatedDeviceTableInfo.selectList = data;
+          break;
+        case "unRelated":
+          this.unRelatedDeviceTableInfo.selectList = data;
+          break;
+      }
+    },
     //点击事件
     handleClick(event, data, index){
       switch(event) {
+        //站点搜索
+        case "search":
+          this.siteTableInfo.initCurpage = Math.random();
+          this.siteTableInfo.refresh = Math.random();
+          break;
+        //添加站点
+        case "create":
+          this.yzaddflag = true;
+          this.title = "新增站点";
+          this.syscityList = this.removeEmptyChild(this.allCity);
+          break;
+        //编辑站点
+        case "update":
+          this.title = "修改站点";
+          for (let key in data) {
+            if (key === "stationType") {
+              data[key] = data[key].toString();
+            }
+            this.ruleForm[key] = data[key];
+          }
+          this.syscityList = this.removeEmptyChild(this.allCity);
+          this.yzaddflag = true;
+          break;
         //查看关联设备
         case "look":
-          this.dialogInfo.visible = true;
           this.dialogInfo.type = event;
-          this.deviceTableInfo.data = data.equips;
-          this.needHandleSiteCode = data.stCode;
+          this.deviceRelatedQuery.siteCode = data.stCode;
+          this.dialogInfo.visible = true;
+          setTimeout(() => {
+            Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+            Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+            this.deviceTableInfo.refresh = Math.random();
+          }, 0);
+          break;
+        //关联设备搜索
+        case "deviceSearch":
+          this.deviceTableInfo.initCurpage = Math.random();
+          this.deviceTableInfo.refresh = Math.random();
+          break;
+        //添加设备到站点
+        case "insert":
+          const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map( item => item.equipNo);
+          const insertData = {
+            siteCode: this.unRelatedDeviceTableInfo.query.siteCode,
+            equipNos: insertEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipInsertBatch, { data: insertData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              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
+            });
+          });
           break;
         //解绑设备与站点
         case "remove":
-          this.$confirm("此操作将解除设备和站点的绑定关系, 是否继续?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(res =>{
-            const params = {
-              data: {
-                siteCode: this.needHandleSiteCode,
-                equipNos: [data.equipNo]
-              }
+          const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(item => item.equipNo);
+          const removeData = {
+            siteCode: this.isRelatedDeviceTableInfo.query.siteCode,
+            equipNos: removeEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipRemoveBatch, { data: removeData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              this.deviceTableInfo.refresh = Math.random();
+              this.deviceTableInfo.initCurpage = Math.random();
             }
-            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(() =>{})
+            this.$message({
+              message: res.data.msg,
+              type: res.data.code === 1 ? "success" : "error",
+              showClose: true
+            });
+          }).catch(e =>{console.log(e)});
           break;
         //关闭
         case "close":
@@ -820,19 +814,21 @@
       };
       this.$refs.cascader.$refs.panel.activePath = [];
       this.$refs.cascader.$refs.panel.clearCheckedNodes();
-      // this.getlistExtend();
     },
     handleChange(value) {
       // 取选中数组的最后一项的id
       this.ruleForm.area = value.slice(-1)[0];
     },
-    handleSizeChange(val) {
-      this.PageSize = val;
-      this.getlistExtend();
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getlistExtend();
+    //将空的children置为undefined,避免在没有下一级数据的情况下显示暂无数据
+    removeEmptyChild(arr) {
+      arr.forEach(item => {
+        if (!item.children || item.children.length < 1) {
+          item.children = undefined;
+        } else {
+          this.removeEmptyChild(item.children);
+        }
+      });
+      return arr;
     }
   },
   destroyed() {
@@ -841,15 +837,10 @@
 };
 </script>
 <style lang="scss" scoped>
-/deep/ .el-pagination .el-pager li.active {
-  background-color: #409eff !important;
-  cursor: default;
-}
 .imgtype {
   width: 150px;
   height: 100px;
 }
-
 /deep/ .el-upload-list {
   display: none;
 }
@@ -858,7 +849,6 @@
   margin: 0 20px 20px 0;
   position: relative;
 }
-
 .deleteSpan {
   position: absolute;
   display: inline-block;
@@ -893,26 +883,33 @@
   width: 200px;
   margin: 0 10px;
 }
-
-.title {
-  height: 50px;
-  line-height: 50px;
+.title, .table-title{
+  @include hl(30px,30px);
+  color: #409EFF;
   text-align: center;
   font-size: 16px;
+  margin-bottom: 10px;
 }
-
 .tableSection {
   padding: 10px;
   background: rgba(270, 255, 255, 0.05);
 }
 /deep/ .el-dialog .el-dialog__body {
   text-align: left;
+  padding-bottom: 0;
 }
-
 .el-dialog .selectInput {
   width: 30% !important;
 }
 .el-dialog .selectInput .el-select-dropdown__empty {
   width: 100% !important;
 }
+.btn-group {
+  height: 100%;
+  @include fdaj(center, center);
+  /deep/ .el-button + .el-button {
+    margin-left: 0;
+    margin-top: 10px;
+  }
+}
 </style>
diff --git a/src/components/ConfigManager/device.vue b/src/components/ConfigManager/device.vue
index f800811..bc4ccda 100644
--- a/src/components/ConfigManager/device.vue
+++ b/src/components/ConfigManager/device.vue
@@ -35,22 +35,97 @@
     </div>
     <!--弹窗-->
     <page-dialog
+      class="page-data-dialog"
       :title="dialogInfo.title[dialogInfo.type]"
       :visible.sync="dialogInfo.visible"
-      :width="dialogInfo.width"
+      :width="dialogInfo.type === 'relate' ? '80%' : '500px'"
       :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"
-      />
+      <!--关联因子-->
+      <template v-if="dialogInfo.type === 'relate'">
+        <div class="page-filter">
+          <el-form :inline="true" :model="factorQuery" ref="factorQuery" size="medium">
+            <el-form-item label="">
+              <el-input v-model="factorQuery.searchStr" placeholder="因子名称/ASCII码" clearable></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="medium" @click="handleClick('factorSearch')">查询</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="page-content">
+          <el-row :gutter="20" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">未关联因子列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="unRelated"
+                :api-url="factorTableInfo.url"
+                :refresh="factorTableInfo.refresh"
+                :data.sync="unRelatedFactorTableInfo.data"
+                :query="unRelatedFactorTableInfo.query"
+                :init-curpage="factorTableInfo.initCurpage"
+                :field-list="factorTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+            <el-col :span="4" class="h-100">
+              <div class="btn-group">
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-right"
+                  :disabled="isCanInsertFactor"
+                  @click="handleClick('insert')"
+                  >添加</el-button
+                >
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-left"
+                  :disabled="isCanRemoveFactor"
+                  @click="handleClick('remove')"
+                  >移除</el-button
+                >
+              </div>
+            </el-col>
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">已关联因子列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="isRelated"
+                :api-url="factorTableInfo.url"
+                :refresh="factorTableInfo.refresh"
+                :data.sync="isRelatedFactorTableInfo.data"
+                :query="isRelatedFactorTableInfo.query"
+                :init-curpage="factorTableInfo.initCurpage"
+                :field-list="factorTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+          </el-row>
+        </div>
+      </template>
+      <!--新增/修改表单-->
+      <template v-else>
+        <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"
+        />
+      </template>
     </page-dialog>
   </div>
 </template>
@@ -80,8 +155,8 @@
           {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"}
+          {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "search", show: true},
+          {type: "button", label: "添加设备", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-3-1"}
         ]
       },
       //设备表格相关
@@ -89,9 +164,7 @@
         url: this.nozzle.sysEquipList, //接口地址
         refresh: 1,
         initCurpage: 1,
-        data: [
-          {equipNo:1000,equipDesc:"3333",equipFactory:'4444'}
-        ],
+        data: [],
         fieldList: [
           { label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
           { label: "设备描述", value: "equipDesc", minWidth: 150, tooltip: true },
@@ -105,8 +178,9 @@
         handle: {
           fixed: "right",
           label: "操作",
-          width: "120",
+          width: "180",
           btList: [
+            { label: "关联因子", size: "small", type: "text", event: "relate", show: true, has: 'm11-3-4' },
             { 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' }
           ]
@@ -143,18 +217,60 @@
       //弹窗相关
       dialogInfo:{
         title: {
-          update: '编辑设备',
-          create: '添加设备'
+          update: "编辑设备",
+          create: "添加设备",
+          relate: "",
         },
-        width: '500px',
+        width: "500px",
         visible: false,
         btLoading: false,
-        type: '',
+        type: "",
         btList: [
-          {label:'关闭',type:'',icon:'',event:'close',show:true},
-          {label:'保存',type:'primary',icon:'',event:'save',show:true,loading:true}
+          {label:"关闭",type:"",icon:"",event:"close",show:true},
+          {label:"保存",type:"primary",icon:"",event:"save",show:true,loading:true}
         ]
       },
+      //因子表格通用相关
+      factorTableInfo: {
+        url: this.nozzle.sysEquipFactorList, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        fieldList: [
+          { label: "因子名称", value: "codeProperty", minWidth: 100, tooltip: true },
+          { label: "因子ASCII码", value: "codeAscll", minWidth: 100, tooltip: true },
+        ]
+      },
+      //已关联因子表格相关
+      isRelatedFactorTableInfo: {
+        data: [],
+        query: {
+          sign: ""
+        },
+        selectList: []
+      },
+      //未关联因子表格相关
+      unRelatedFactorTableInfo: {
+        data: [],
+        query: {
+          sign: "unbound"
+        },
+        selectList: []
+      },
+      //设备关联过滤相关
+      factorQuery: {
+        searchStr: "",
+        equipNo: ""
+      }
+    }
+  },
+  computed: {
+    //移除按钮是否可点击
+    isCanRemoveFactor() {
+      return this.isRelatedFactorTableInfo.selectList.length ? false : true;
+    },
+    //添加按钮是否可点击
+    isCanInsertFactor() {
+      return this.unRelatedFactorTableInfo.selectList.length ? false : true;
     }
   },
   watch: {
@@ -165,8 +281,20 @@
         }
         this.resetForm();
         this.btnLoading = false;
+        this.factorQuery.searchStr = "";
       }
     },
+    "dialogInfo.type"(val) {
+      this.dialogInfo.btList.forEach(item =>{
+        if(item.event === "save") {
+          item.show = val === "relate" ? false : true;
+        }
+      })
+    },
+    "factorQuery.searchStr"(val) {
+      Object.assign(this.isRelatedFactorTableInfo.query, this.factorQuery);
+      Object.assign(this.unRelatedFactorTableInfo.query, this.factorQuery);
+    }
   },
   created() {
     this.initSiteData();
@@ -198,6 +326,17 @@
         }
       })
     },
+    //表格checkbox选择事件
+    handleEvent(event, data) {
+      switch (event) {
+        case "isRelated":
+          this.isRelatedFactorTableInfo.selectList = data;
+          break;
+        case "unRelated":
+          this.unRelatedFactorTableInfo.selectList = data;
+          break;
+      }
+    },
     //点击事件
     handleClick(event, data) {
       switch (event) {
@@ -243,6 +382,62 @@
             })
           }).catch(() =>{})
           break;
+        //查看关联因子
+        case "relate":
+          this.dialogInfo.type = event;
+          this.factorQuery.equipNo = data.equipNo;
+          this.dialogInfo.visible = true;
+          setTimeout(() => {
+            Object.assign(this.isRelatedFactorTableInfo.query, this.factorQuery);
+            Object.assign(this.unRelatedFactorTableInfo.query, this.factorQuery);
+            this.factorTableInfo.refresh = Math.random();
+          }, 0);
+          break;
+        //关联因子搜索
+        case "factorSearch":
+          this.factorTableInfo.initCurpage = Math.random();
+          this.factorTableInfo.refresh = Math.random();
+          break;
+        //添加因子到站点
+        case "insert":
+          const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map( item => item.equipNo);
+          const insertData = {
+            siteCode: this.unRelatedDeviceTableInfo.query.siteCode,
+            equipNos: insertEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipInsertBatch, { data: insertData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              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
+            });
+          });
+          break;
+        //解绑因子与站点
+        case "remove":
+          const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(item => item.equipNo);
+          const removeData = {
+            siteCode: this.isRelatedDeviceTableInfo.query.siteCode,
+            equipNos: removeEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipRemoveBatch, { data: removeData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              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 =>{console.log(e)});
+          break;
         //关闭
         case "close":
           setTimeout(() => {
@@ -294,4 +489,22 @@
     },
   }
 }
-</script>
\ No newline at end of file
+</script>
+
+<style lang="scss" scoped>
+.table-title{
+  @include hl(30px,30px);
+  color: #409EFF;
+  text-align: center;
+  font-size: 16px;
+  margin-bottom: 10px;
+}
+.btn-group {
+  height: 100%;
+  @include fdaj(center, center);
+  /deep/ .el-button + .el-button {
+    margin-left: 0;
+    margin-top: 10px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/ConfigManager/factor.vue b/src/components/ConfigManager/factor.vue
new file mode 100644
index 0000000..f38f0b9
--- /dev/null
+++ b/src/components/ConfigManager/factor.vue
@@ -0,0 +1,79 @@
+<template>
+  <div class="page-data">
+    <!--搜素框-->
+    <div class="page-filter">
+      <page-filter
+        :query.sync="factorFilterInfo.query"
+        :filter-list="factorFilterInfo.list"
+        @handleClick="handleClick"
+      />
+    </div>
+    <div class="page-content">
+      <!--表格-->
+      <div class="h-100">
+        <page-table
+          tabIndex
+          pagination
+          :api-url="factorTableInfo.url"
+          :refresh="factorTableInfo.refresh"
+          :data.sync="factorTableInfo.data"
+          :query="factorFilterInfo.query"
+          :page-query="factorTableInfo.pageQuery"
+          :init-curpage="factorTableInfo.initCurpage"
+          :field-list="factorTableInfo.fieldList"
+          @handleClick="handleClick"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { message } from "./../../util/item";
+export default {
+  data() {
+    return {
+      //因子搜索相关
+      factorFilterInfo: {
+        query: {
+          searchStr: "",
+        },
+        list: [
+          {type: "input", label: "因子名称/ASCII码", value: "searchStr", hideLabel: true },
+          {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "search", show: true},
+        ]
+      },
+      //因子表格相关
+      factorTableInfo: {
+        url: this.nozzle.sysEquipConfigList, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [],
+        fieldList: [
+          { label: "因子名称", value: "codeProperty", minWidth: 150, tooltip: true },
+          { label: "因子ASCII码", value: "codeAscll", minWidth: 100, tooltip: true },
+          { label: "水文编号", value: "code", minWidth: 100, tooltip: true },
+          { label: "因子最大值", value: "maxValue", minWidth: 100, tooltip: true },
+          { label: "因子最小值", value: "minValue", minWidth: 100, tooltip: true },
+          { label: "因子单位", value: "unit", minWidth: 100, tooltip: true },
+        ]
+      }
+    }
+  },
+  mounted() {
+    this.factorTableInfo.refresh = Math.random();
+  },
+  methods: {
+    //点击事件
+    handleClick(event, data) {
+      switch (event) {
+        //设备搜索
+        case "search":
+          this.factorTableInfo.initCurpage = Math.random();
+          this.factorTableInfo.refresh = Math.random();
+          break;
+      }
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index 065f3da..31253a6 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -35,6 +35,7 @@
     </div>
     <!--弹窗-->
     <el-dialog
+      class="page-data-dialog"
       :width="dialogInfo.width"
       append-to-body
       :title="dialogInfo.title[dialogInfo.type]"
@@ -55,9 +56,10 @@
         </div>
         <div class="page-content">
           <el-row :gutter="20" class="h-100">
-            <el-col :span="10" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">未关联站点列表</div>
               <page-table
-                tabIndex
+                class="flex-1"
                 checkBox
                 pagination
                 type="unRelate"
@@ -91,9 +93,10 @@
                 >
               </div>
             </el-col>
-            <el-col :span="10" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">已关联站点列表</div>
               <page-table
-                tabIndex
+                class="flex-1"
                 checkBox
                 pagination
                 type="isRelate"
@@ -244,8 +247,8 @@
           {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: "searchProject", show: true},
-          {type: "button", label: "添加项目", btType: "primary", icon: "", event: "create", show: true, has: "m11-1-4"}
+          {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "searchProject", show: true},
+          {type: "button", label: "添加项目", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-1-4"}
         ]
       },
       //项目表格相关
@@ -269,7 +272,7 @@
           width: "240",
           btList: [
             { label: "分配权限", size: "small", type: "text", event: "permission", show: true, has: 'm11-1-1' },
-            { label: "项目关联站点", size: "small", type: "text", event: "relate", show: true, has: 'm11-1-2' },
+            { label: "关联站点", size: "small", type: "text", event: "relate", show: true, has: 'm11-1-2' },
             { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-1-3' },
             { label: "删除", size: "small", type: "text", event: "delete", show: true, has: 'm11-1-5' }
           ]
@@ -329,10 +332,9 @@
         xmlxList: [{ key: "合同项目", value: "0" }, { key: "临测项目", value: "1" }],
         groupList: [],
         deptTree: [],
-        roleTree: [],
         userType: [{ key: "普通用户", value: 0 }, { key: "超级管理员", value: 1 }],
         statusList: [{ key: "未管理", value: 0 }, { key: "管理中", value: 1 }],
-        roleList: [{ key: "111", value: 0 }, { key: "2222", value: 1 }],
+        roleList: [],
       },
       //用户弹窗相关
       userDialogInfo: {
@@ -679,7 +681,6 @@
           this.dialogInfo.visible = true;
           this.dialogInfo.type = event;
           this.listTypeInfo.deptTree = this.allDept;
-          this.listTypeInfo.roleTree = this.allRole;
           this.needHandleProjectId = data.platformCode;
           this.permissionFilterInfo.query.platformCode = data.platformCode;
           setTimeout(() => {
@@ -1005,14 +1006,16 @@
   .el-dialog__body {
     @include fd();
     flex: 1;
-    padding: 20px;
+    padding-bottom: 0;
     overflow-y: auto;
   }
-  .el-pagination__sizes,
-  .el-pagination__total,
-  .el-pagination__jump {
-    display: none;
-  }
+}
+.table-title{
+  @include hl(30px,30px);
+  color: #409EFF;
+  text-align: center;
+  font-size: 16px;
+  margin-bottom: 10px;
 }
 .userDialog {
   /deep/ .el-form-item {
diff --git a/src/components/common/PageFilter/index.vue b/src/components/common/PageFilter/index.vue
index a4e93b0..614a410 100644
--- a/src/components/common/PageFilter/index.vue
+++ b/src/components/common/PageFilter/index.vue
@@ -238,4 +238,7 @@
       z-index: 10;
     }
   }
+  /deep/ .el-icon-date:before{
+    color: #fff;
+  }
 </style>
diff --git a/src/components/common/PageForm/index.vue b/src/components/common/PageForm/index.vue
index ddbc8e0..10915fa 100644
--- a/src/components/common/PageForm/index.vue
+++ b/src/components/common/PageForm/index.vue
@@ -243,12 +243,6 @@
         }
       },
       deep: true, // 深度监听
-    },
-    rules: {
-      handler(newVal, oldVal) {
-        console.log(6666,newVal, oldVal);
-      },
-      deep: true,
     }
   },
   mounted () {
@@ -362,6 +356,9 @@
     .el-form-item__label{
       text-align: right !important;
     }
+    .el-icon-date:before{
+      color: #fff;
+    }
   }
   /deep/ .el-form-block{
     width: 100%;
diff --git a/src/components/common/PageTable/index.vue b/src/components/common/PageTable/index.vue
index 0536b03..b992a54 100644
--- a/src/components/common/PageTable/index.vue
+++ b/src/components/common/PageTable/index.vue
@@ -102,7 +102,7 @@
         layout="total, sizes, prev, pager, next, jumper"
         :total="listInfo.total"
         :pager-count="5"
-        :page-sizes="[10, 50, 100, 500, 1000]"
+        :page-sizes="[10, 20, 30, 40]"
         :page-size="listInfo.query.size"
         :current-page.sync="listInfo.query.current"
         @current-change="handleCurrentChange"
diff --git a/src/components/index.vue b/src/components/index.vue
index e9b9720..031723d 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -118,6 +118,11 @@
                 v-has="'m11-3'"
                 >设备管理</el-menu-item
               >
+              <el-menu-item
+                index="/ConfigManager/factor"
+                v-has="'m11-4'"
+                >因子管理</el-menu-item
+              >
             </el-submenu>
             <el-submenu index="5" v-has="'m4'">
               <template slot="title">

diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index b4e4a8f..440a79e 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -78,6 +78,15 @@
   background: transparent;
 }
 /****页面通用样式****/
+.flex{
+  display: flex;
+}
+.flex-1{
+  flex: 1;
+}
+.flex-d{
+  flex-direction: column;
+}
 .page-data {
   display: flex;
   flex-direction: column;
@@ -108,10 +117,10 @@
   flex-direction: column;
   flex: 1;
   padding: 20px;
+  padding-bottom: 0 !important;
   overflow-y: auto;
 }
 .page-data-dialog .el-pagination__sizes,
-.page-data-dialog .el-pagination__total,
 .page-data-dialog .el-pagination__jump{
-  display: none;
+  display: none !important;
 }
\ No newline at end of file
diff --git a/src/assets/css/mixin.css b/src/assets/css/mixin.css
deleted file mode 100644
index 9e97d02..0000000
--- a/src/assets/css/mixin.css
+++ /dev/null
@@ -1 +0,0 @@
-/* No CSS *//*# sourceMappingURL=mixin.css.map */
\ No newline at end of file
diff --git a/src/assets/css/mixin.css.map b/src/assets/css/mixin.css.map
deleted file mode 100644
index 356f200..0000000
--- a/src/assets/css/mixin.css.map
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "version": 3,
-    "mappings": "",
-    "sources": [
-        "mixin.scss"
-    ],
-    "names": [],
-    "file": "mixin.css"
-}
\ No newline at end of file
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 219a678..281044c 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -1,107 +1,37 @@
 <template>
-  <div id="pagetwo">
-    <div class="form">
-      <el-input
-        v-model="searchStr"
-        placeholder="请输入站点编号或站点名称"
-        clearable
-        @change="handleChangeSearch"
-      ></el-input>
-      <el-date-picker
-        v-model="startDate"
-        value-format="yyyy-MM-dd"
-        :picker-options="pickerOptionsStart"
-        type="date"
-        :clearable="true"
-        placeholder="请选择开始日期"
+  <div id="pagetwo" class="page-data">
+    <!--搜素框-->
+    <div class="page-filter">
+      <page-filter
+        :query.sync="siteFilterInfo.query"
+        :filter-list="siteFilterInfo.list"
+        @handleClick="handleClick"
       />
-      <el-date-picker
-        v-model="endDate"
-        value-format="yyyy-MM-dd"
-        :picker-options="pickerOptionsEnd"
-        type="date"
-        :clearable="true"
-        placeholder="请选择结束日期"
-      />
-      <el-button
-        type="primary"
-        icon="el-icon-search"
-        @click="search"
-        v-has="'Search'"
-        >查询</el-button
-      >
-      <el-button
-        type="primary"
-        icon="el-icon-circle-plus-outline"
-        @click="addform('ruleForm')"
-        v-has="'m11-2-1'"
-        >添加站点</el-button
-      >
     </div>
-
-    <el-table :data="listExtend" style="width: 100%; height: calc(100% - 82px)">
-      <el-table-column
-        type="index"
-        label="序号"
-        width="70"
-      ></el-table-column>
-      <el-table-column
-        prop="stCode"
-        label="站点编号"
-        max-width="120"
-        show-overflow-tooltip
-      ></el-table-column>
-      <el-table-column
-        prop="stName"
-        label="站点名称"
-        show-overflow-tooltip
-        max-width="150"
-      ></el-table-column>
-      <el-table-column label="站点类型" width="120">
-        <template slot-scope="scope">
-          <div>
-            <span v-if="scope.row.stationType == 0">水质站</span>
-            <span v-if="scope.row.stationType == 1">水位站</span>
-            <span v-if="scope.row.stationType == 2">流量站</span>
-          </div>
-        </template></el-table-column
-      >
-      <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"
-            size="small"
-            @click="EditFZ(scope.$index, scope.row)"
-            style="margin: 0 10px"
-            v-has="'m11-2-2'"
-            >修改</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
+    <div class="page-content">
+      <!--表格-->
+      <div class="h-100">
+        <page-table
+          tabIndex
+          pagination
+          :api-url="siteTableInfo.url"
+          :refresh="siteTableInfo.refresh"
+          :data.sync="siteTableInfo.data"
+          :query="siteFilterInfo.query"
+          :page-query="siteTableInfo.pageQuery"
+          :list-type-info="listTypeInfo"
+          :init-curpage="siteTableInfo.initCurpage"
+          :field-list="siteTableInfo.fieldList"
+          :handle="siteTableInfo.handle"
+          @handleClick="handleClick"
+        >
+          <!-- 自定义插槽显示状态 -->
+          <template v-slot:col-equips="scope">
+            <el-button type="text" size="small" @click="handleClick('look',scope.row)">查看设备</el-button>
+          </template>
+        </page-table>
+      </div>
+    </div>
 
     <!-- 新增/修改的弹出框 -->
     <el-dialog
@@ -266,72 +196,138 @@
       class="page-data-dialog"
       :title="dialogInfo.title[dialogInfo.type]"
       :visible.sync="dialogInfo.visible"
-      :width="dialogInfo.width"
+      width="80%"
       :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"
-      />
+      <template v-if="dialogInfo.type === 'look'">
+        <div class="page-filter">
+          <el-form :inline="true" :model="deviceRelatedQuery" ref="deviceRelatedQuery" size="medium">
+            <el-form-item label="">
+              <el-input v-model="deviceRelatedQuery.searchStr" placeholder="请输入设备编号/厂家" clearable></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="medium" @click="handleClick('deviceSearch')">查询</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="page-content">
+          <el-row :gutter="20" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">未关联设备列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="unRelated"
+                :api-url="deviceTableInfo.url"
+                :refresh="deviceTableInfo.refresh"
+                :data.sync="unRelatedDeviceTableInfo.data"
+                :query="unRelatedDeviceTableInfo.query"
+                :init-curpage="deviceTableInfo.initCurpage"
+                :field-list="deviceTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+            <el-col :span="4" class="h-100">
+              <div class="btn-group">
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-right"
+                  :disabled="isCanInsertDevice"
+                  @click="handleClick('insert')"
+                  >添加</el-button
+                >
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-left"
+                  :disabled="isCanRemoveDevice"
+                  @click="handleClick('remove')"
+                  >移除</el-button
+                >
+              </div>
+            </el-col>
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">已关联设备列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="isRelated"
+                :api-url="deviceTableInfo.url"
+                :refresh="deviceTableInfo.refresh"
+                :data.sync="isRelatedDeviceTableInfo.data"
+                :query="isRelatedDeviceTableInfo.query"
+                :init-curpage="deviceTableInfo.initCurpage"
+                :field-list="deviceTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+          </el-row>
+        </div>
+      </template>
     </page-dialog>
-    <el-pagination
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page="currentPage"
-      :page-sizes="[10, 20, 30, 40]"
-      :page-size="PageSize"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="AllTotal"
-    >
-    </el-pagination>
   </div>
 </template>
 <script>
 import axios from "axios";
-
+import { mapGetters } from "vuex";
 export default {
-  name: "StatisticalReport",
   data() {
     return {
+      //站点搜索相关
+      siteFilterInfo: {
+        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: "el-icon-search", event: "search", show: true},
+          {type: "button", label: "添加站点", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-2-1"}
+        ]
+      },
+      //站点表格相关
+      siteTableInfo: {
+        url: this.nozzle.listExtend, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [],
+        fieldList: [
+          { label: "站点编号", value: "stCode", minWidth: 120, tooltip: true },
+          { label: "站点名称", value: "stName", minWidth: 120, tooltip: true },
+          { label: "站点类型", value: "stationTypeName", width: 120 },
+          { label: "站点安装时间", value: "createTime", minWidth: 120, tooltip: true },
+          { label: "安装人", value: "person", width: 120 },
+          { label: "关联设备", value: "equips", width: 100, type: "slot" },
+          { label: "首次数据接入时间", value: "tt", minWidth: 120, tooltip: true },
+        ],
+        handle: {
+          fixed: "right",
+          label: "操作",
+          width: "80",
+          btList: [
+            { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-2-2' }
+          ]
+        }
+      },
+      //列表相关
+      listTypeInfo: {},
       loadingdelet: undefined,
       loading: false,
       timer: null,
       dialogImageUrl: "",
       dialogVisible: false,
-      PageSize: 10,
-      AllTotal: 0,
-      currentPage: 1,
       title: "站点管理",
-      listExtend: [], // 站点管理的返回数据
       siteTypeList: [], //弹框里面站点类型列表
-      searchStr: "",
-      file: [],
-      startDate: "",
-      endDate: "",
-      pickerOptionsStart: {
-        //结束时间不能大于开始时间
-        disabledDate: time => {
-          if (this.endDate) {
-            return time.getTime() > new Date(this.endDate).getTime();
-          }
-        }
-      },
-      pickerOptionsEnd: {
-        disabledDate: time => {
-          return time.getTime() < new Date(this.startDate).getTime();
-        }
-      },
-      List: [],
-      ledlist: [],
       yzaddflag: false,
       ruleForm: {
         id: "", //站点ID
@@ -431,7 +427,7 @@
       //弹窗相关
       dialogInfo:{
         title: {
-          look: '关联设备列表'
+          look: ''
         },
         width: '60%',
         visible: false,
@@ -441,65 +437,65 @@
           {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: '', //接口地址
+        url: this.nozzle.sysEquipRelatedList, //接口地址
         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: "",
+      //已关联设备表格相关
+      isRelatedDeviceTableInfo: {
+        data: [],
+        query: {
+          sign: ""
+        },
+        selectList: []
+      },
+      //未关联设备表格相关
+      unRelatedDeviceTableInfo: {
+        data: [],
+        query: {
+          sign: "unbound"
+        },
+        selectList: []
+      },
+      //设备关联过滤相关
+      deviceRelatedQuery: {
+        searchStr: "",
+        siteCode: ""
+      }
     };
   },
   mounted() {
-    this.getsyscityList();
-    this.getlistExtend();
+    this.siteTableInfo.refresh = Math.random();
     this.getsityType();
     this.getCurrentUserProject(); //获取当前用户所绑定的项目
   },
+  computed: {
+    //移除按钮是否可点击
+    isCanRemoveDevice() {
+      return this.isRelatedDeviceTableInfo.selectList.length ? false : true;
+    },
+    //添加按钮是否可点击
+    isCanInsertDevice() {
+      return this.unRelatedDeviceTableInfo.selectList.length ? false : true;
+    },
+    ...mapGetters(["allDept", "allRole", "allCity"])
+  },
   watch: {
     "ruleForm.area": {
       handler(newVal, oldVal) {
         if (this.$refs.cascader) {
           let children = this.$refs.cascader.getCheckedNodes();
-          // console.log(children);
           if (
             children.length &&
             children[0].children &&
             children[0].children.length < 1
           ) {
-            // console.log(9999);
             this.$refs.cascader.dropDownVisible = false;
           }
         }
@@ -516,30 +512,18 @@
     "dialogInfo.visible"(val) {
       if(!val) {
         this.deviceTableInfo.data = [];
+        this.deviceRelatedQuery.searchStr = "";
         this.dialogInfo.btLoading = false;
       }
+    },
+    "deviceRelatedQuery.searchStr"(val) {
+      Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+      Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
     }
   },
   methods: {
-    //将空的children置为undefined,避免在没有下一级数据的情况下显示暂无数据
-    removeEmptyChild(arr) {
-      arr.forEach(item => {
-        if (!item.children || item.children.length < 1) {
-          item.children = undefined;
-        } else {
-          this.removeEmptyChild(item.children);
-        }
-      });
-      return arr;
-    },
-    handleChangeSearch() {
-      this.currentPage = 1;
-      this.getlistExtend();
-    },
     //上传头像
     fileChange(file) {
-      // console.log(file.size, file.raw.type);
-      // const isJPG = file.raw.type === "image/jpeg";
       this.loading = true;
       const isLt1M = file.size / 1024 / 1024 < 1;
       if (file.raw.type != "image/jpeg" && file.raw.type != "image/png") {
@@ -559,25 +543,24 @@
       let config = {
         headers: { "Content-Type": "multipart/form-data" }
       };
-      axios
-        .post(this.nozzle.upload, formdata, config)
-        .then(res => {
-          if (res.data.code == 1) {
-            this.loading = false;
-            this.$message({
-              message: "上传图片成功！",
-              type: "success"
-            });
-            this.ruleForm.fileList.push(res.data.data[0]);
-          }
-        })
-        .catch(res => {
+      axios.post(this.nozzle.upload, formdata, config).then(res => {
+        if (res.data.code == 1) {
           this.loading = false;
           this.$message({
-            message: "服务器问题！请重试！",
-            type: "warning"
+            message: "上传图片成功！",
+            type: "success"
           });
+          this.ruleForm.fileList.push(res.data.data[0]);
+          this.siteTableInfo.refresh = Math.random();
+        }
+      })
+      .catch(res => {
+        this.loading = false;
+        this.$message({
+          message: "服务器问题！请重试！",
+          type: "warning"
         });
+      });
     },
     // 删除图片按钮
     deleteImg(fileNo) {
@@ -633,39 +616,24 @@
       this.dialogImageUrl = file.fileCloudStorageKey;
       this.dialogVisible = true;
     },
-    // 获取站点列表
-    async getlistExtend() {
-      const { data } = await this.$http.post(this.nozzle.listExtend, {
-        current: this.currentPage,
-        data: {
-          searchStr: this.searchStr,
-          startDate: this.startDate,
-          endDate: this.endDate
-        },
-        size: this.PageSize
-      });
-      this.listExtend = data.data.list;
-      this.AllTotal = data.data.total;
-    },
-    // 搜索查询按钮
-    search() {
-      this.currentPage = 1;
-      this.getlistExtend();
-    },
-    deleteRow(index, rows) {
-      rows.splice(index, 1);
-    },
     // 弹框提交表单按钮
     saveOru(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
-          this.$http
-            .post(this.nozzle.saveOrupdate, {
-              data: this.ruleForm
-            })
-            .then(res => {
+          this.$http.post(this.nozzle.saveOrupdate, {
+            data: this.ruleForm
+          })
+          .then(res => {
+            if(res.data.code === 1) {
+              this.siteTableInfo.refresh = Math.random();
               this.yzaddflag = false;
-            });
+            }
+            this.$message({
+              message: res.data.msg,
+              type: res.data.code === 1 ? 'success' : 'error',
+              showClose: true,
+            })
+          });
         }
       });
     },
@@ -674,7 +642,6 @@
       this.yzaddflag = false;
       this.$refs[formName].resetFields();
     },
-
     visiblechange(visible) {
       if (visible) {
         this.timer = setInterval(() => {
@@ -690,34 +657,6 @@
         clearInterval(this.timer);
       }
     },
-    // 添加站点
-    addform(formName) {
-      this.yzaddflag = true;
-      // 获取地区列表
-      this.title = "新增站点";
-    },
-    // 操作里面的修改弹窗
-    EditFZ(index, rows) {
-      // 获取地区列表
-      for (let key in rows) {
-        if (key === "stationType") {
-          rows[key] = rows[key].toString();
-        }
-        this.ruleForm[key] = rows[key];
-      }
-      this.yzaddflag = true;
-      this.title = "修改站点";
-      this.FenZuflag2type = 2;
-      this.AddFZInput = rows.groupName;
-      this.ClickID = rows.id;
-    },
-    // 获取地区列表数据
-    async getsyscityList() {
-      const { data } = await this.$http.post(this.nozzle.syscity);
-
-      let arr = this.removeEmptyChild(data.data);
-      this.syscityList = data.data;
-    },
     //获取站点类型列表
     async getsityType() {
       const { data } = await this.$http.post(this.nozzle.sityType, {
@@ -745,43 +684,98 @@
         }
       })
     },
+    //表格checkbox选择事件
+    handleEvent(event, data) {
+      switch (event) {
+        case "isRelated":
+          this.isRelatedDeviceTableInfo.selectList = data;
+          break;
+        case "unRelated":
+          this.unRelatedDeviceTableInfo.selectList = data;
+          break;
+      }
+    },
     //点击事件
     handleClick(event, data, index){
       switch(event) {
+        //站点搜索
+        case "search":
+          this.siteTableInfo.initCurpage = Math.random();
+          this.siteTableInfo.refresh = Math.random();
+          break;
+        //添加站点
+        case "create":
+          this.yzaddflag = true;
+          this.title = "新增站点";
+          this.syscityList = this.removeEmptyChild(this.allCity);
+          break;
+        //编辑站点
+        case "update":
+          this.title = "修改站点";
+          for (let key in data) {
+            if (key === "stationType") {
+              data[key] = data[key].toString();
+            }
+            this.ruleForm[key] = data[key];
+          }
+          this.syscityList = this.removeEmptyChild(this.allCity);
+          this.yzaddflag = true;
+          break;
         //查看关联设备
         case "look":
-          this.dialogInfo.visible = true;
           this.dialogInfo.type = event;
-          this.deviceTableInfo.data = data.equips;
-          this.needHandleSiteCode = data.stCode;
+          this.deviceRelatedQuery.siteCode = data.stCode;
+          this.dialogInfo.visible = true;
+          setTimeout(() => {
+            Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+            Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+            this.deviceTableInfo.refresh = Math.random();
+          }, 0);
+          break;
+        //关联设备搜索
+        case "deviceSearch":
+          this.deviceTableInfo.initCurpage = Math.random();
+          this.deviceTableInfo.refresh = Math.random();
+          break;
+        //添加设备到站点
+        case "insert":
+          const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map( item => item.equipNo);
+          const insertData = {
+            siteCode: this.unRelatedDeviceTableInfo.query.siteCode,
+            equipNos: insertEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipInsertBatch, { data: insertData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              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
+            });
+          });
           break;
         //解绑设备与站点
         case "remove":
-          this.$confirm("此操作将解除设备和站点的绑定关系, 是否继续?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(res =>{
-            const params = {
-              data: {
-                siteCode: this.needHandleSiteCode,
-                equipNos: [data.equipNo]
-              }
+          const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(item => item.equipNo);
+          const removeData = {
+            siteCode: this.isRelatedDeviceTableInfo.query.siteCode,
+            equipNos: removeEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipRemoveBatch, { data: removeData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              this.deviceTableInfo.refresh = Math.random();
+              this.deviceTableInfo.initCurpage = Math.random();
             }
-            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(() =>{})
+            this.$message({
+              message: res.data.msg,
+              type: res.data.code === 1 ? "success" : "error",
+              showClose: true
+            });
+          }).catch(e =>{console.log(e)});
           break;
         //关闭
         case "close":
@@ -820,19 +814,21 @@
       };
       this.$refs.cascader.$refs.panel.activePath = [];
       this.$refs.cascader.$refs.panel.clearCheckedNodes();
-      // this.getlistExtend();
     },
     handleChange(value) {
       // 取选中数组的最后一项的id
       this.ruleForm.area = value.slice(-1)[0];
     },
-    handleSizeChange(val) {
-      this.PageSize = val;
-      this.getlistExtend();
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getlistExtend();
+    //将空的children置为undefined,避免在没有下一级数据的情况下显示暂无数据
+    removeEmptyChild(arr) {
+      arr.forEach(item => {
+        if (!item.children || item.children.length < 1) {
+          item.children = undefined;
+        } else {
+          this.removeEmptyChild(item.children);
+        }
+      });
+      return arr;
     }
   },
   destroyed() {
@@ -841,15 +837,10 @@
 };
 </script>
 <style lang="scss" scoped>
-/deep/ .el-pagination .el-pager li.active {
-  background-color: #409eff !important;
-  cursor: default;
-}
 .imgtype {
   width: 150px;
   height: 100px;
 }
-
 /deep/ .el-upload-list {
   display: none;
 }
@@ -858,7 +849,6 @@
   margin: 0 20px 20px 0;
   position: relative;
 }
-
 .deleteSpan {
   position: absolute;
   display: inline-block;
@@ -893,26 +883,33 @@
   width: 200px;
   margin: 0 10px;
 }
-
-.title {
-  height: 50px;
-  line-height: 50px;
+.title, .table-title{
+  @include hl(30px,30px);
+  color: #409EFF;
   text-align: center;
   font-size: 16px;
+  margin-bottom: 10px;
 }
-
 .tableSection {
   padding: 10px;
   background: rgba(270, 255, 255, 0.05);
 }
 /deep/ .el-dialog .el-dialog__body {
   text-align: left;
+  padding-bottom: 0;
 }
-
 .el-dialog .selectInput {
   width: 30% !important;
 }
 .el-dialog .selectInput .el-select-dropdown__empty {
   width: 100% !important;
 }
+.btn-group {
+  height: 100%;
+  @include fdaj(center, center);
+  /deep/ .el-button + .el-button {
+    margin-left: 0;
+    margin-top: 10px;
+  }
+}
 </style>
diff --git a/src/components/ConfigManager/device.vue b/src/components/ConfigManager/device.vue
index f800811..bc4ccda 100644
--- a/src/components/ConfigManager/device.vue
+++ b/src/components/ConfigManager/device.vue
@@ -35,22 +35,97 @@
     </div>
     <!--弹窗-->
     <page-dialog
+      class="page-data-dialog"
       :title="dialogInfo.title[dialogInfo.type]"
       :visible.sync="dialogInfo.visible"
-      :width="dialogInfo.width"
+      :width="dialogInfo.type === 'relate' ? '80%' : '500px'"
       :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"
-      />
+      <!--关联因子-->
+      <template v-if="dialogInfo.type === 'relate'">
+        <div class="page-filter">
+          <el-form :inline="true" :model="factorQuery" ref="factorQuery" size="medium">
+            <el-form-item label="">
+              <el-input v-model="factorQuery.searchStr" placeholder="因子名称/ASCII码" clearable></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="medium" @click="handleClick('factorSearch')">查询</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="page-content">
+          <el-row :gutter="20" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">未关联因子列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="unRelated"
+                :api-url="factorTableInfo.url"
+                :refresh="factorTableInfo.refresh"
+                :data.sync="unRelatedFactorTableInfo.data"
+                :query="unRelatedFactorTableInfo.query"
+                :init-curpage="factorTableInfo.initCurpage"
+                :field-list="factorTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+            <el-col :span="4" class="h-100">
+              <div class="btn-group">
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-right"
+                  :disabled="isCanInsertFactor"
+                  @click="handleClick('insert')"
+                  >添加</el-button
+                >
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-left"
+                  :disabled="isCanRemoveFactor"
+                  @click="handleClick('remove')"
+                  >移除</el-button
+                >
+              </div>
+            </el-col>
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">已关联因子列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="isRelated"
+                :api-url="factorTableInfo.url"
+                :refresh="factorTableInfo.refresh"
+                :data.sync="isRelatedFactorTableInfo.data"
+                :query="isRelatedFactorTableInfo.query"
+                :init-curpage="factorTableInfo.initCurpage"
+                :field-list="factorTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+          </el-row>
+        </div>
+      </template>
+      <!--新增/修改表单-->
+      <template v-else>
+        <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"
+        />
+      </template>
     </page-dialog>
   </div>
 </template>
@@ -80,8 +155,8 @@
           {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"}
+          {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "search", show: true},
+          {type: "button", label: "添加设备", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-3-1"}
         ]
       },
       //设备表格相关
@@ -89,9 +164,7 @@
         url: this.nozzle.sysEquipList, //接口地址
         refresh: 1,
         initCurpage: 1,
-        data: [
-          {equipNo:1000,equipDesc:"3333",equipFactory:'4444'}
-        ],
+        data: [],
         fieldList: [
           { label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
           { label: "设备描述", value: "equipDesc", minWidth: 150, tooltip: true },
@@ -105,8 +178,9 @@
         handle: {
           fixed: "right",
           label: "操作",
-          width: "120",
+          width: "180",
           btList: [
+            { label: "关联因子", size: "small", type: "text", event: "relate", show: true, has: 'm11-3-4' },
             { 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' }
           ]
@@ -143,18 +217,60 @@
       //弹窗相关
       dialogInfo:{
         title: {
-          update: '编辑设备',
-          create: '添加设备'
+          update: "编辑设备",
+          create: "添加设备",
+          relate: "",
         },
-        width: '500px',
+        width: "500px",
         visible: false,
         btLoading: false,
-        type: '',
+        type: "",
         btList: [
-          {label:'关闭',type:'',icon:'',event:'close',show:true},
-          {label:'保存',type:'primary',icon:'',event:'save',show:true,loading:true}
+          {label:"关闭",type:"",icon:"",event:"close",show:true},
+          {label:"保存",type:"primary",icon:"",event:"save",show:true,loading:true}
         ]
       },
+      //因子表格通用相关
+      factorTableInfo: {
+        url: this.nozzle.sysEquipFactorList, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        fieldList: [
+          { label: "因子名称", value: "codeProperty", minWidth: 100, tooltip: true },
+          { label: "因子ASCII码", value: "codeAscll", minWidth: 100, tooltip: true },
+        ]
+      },
+      //已关联因子表格相关
+      isRelatedFactorTableInfo: {
+        data: [],
+        query: {
+          sign: ""
+        },
+        selectList: []
+      },
+      //未关联因子表格相关
+      unRelatedFactorTableInfo: {
+        data: [],
+        query: {
+          sign: "unbound"
+        },
+        selectList: []
+      },
+      //设备关联过滤相关
+      factorQuery: {
+        searchStr: "",
+        equipNo: ""
+      }
+    }
+  },
+  computed: {
+    //移除按钮是否可点击
+    isCanRemoveFactor() {
+      return this.isRelatedFactorTableInfo.selectList.length ? false : true;
+    },
+    //添加按钮是否可点击
+    isCanInsertFactor() {
+      return this.unRelatedFactorTableInfo.selectList.length ? false : true;
     }
   },
   watch: {
@@ -165,8 +281,20 @@
         }
         this.resetForm();
         this.btnLoading = false;
+        this.factorQuery.searchStr = "";
       }
     },
+    "dialogInfo.type"(val) {
+      this.dialogInfo.btList.forEach(item =>{
+        if(item.event === "save") {
+          item.show = val === "relate" ? false : true;
+        }
+      })
+    },
+    "factorQuery.searchStr"(val) {
+      Object.assign(this.isRelatedFactorTableInfo.query, this.factorQuery);
+      Object.assign(this.unRelatedFactorTableInfo.query, this.factorQuery);
+    }
   },
   created() {
     this.initSiteData();
@@ -198,6 +326,17 @@
         }
       })
     },
+    //表格checkbox选择事件
+    handleEvent(event, data) {
+      switch (event) {
+        case "isRelated":
+          this.isRelatedFactorTableInfo.selectList = data;
+          break;
+        case "unRelated":
+          this.unRelatedFactorTableInfo.selectList = data;
+          break;
+      }
+    },
     //点击事件
     handleClick(event, data) {
       switch (event) {
@@ -243,6 +382,62 @@
             })
           }).catch(() =>{})
           break;
+        //查看关联因子
+        case "relate":
+          this.dialogInfo.type = event;
+          this.factorQuery.equipNo = data.equipNo;
+          this.dialogInfo.visible = true;
+          setTimeout(() => {
+            Object.assign(this.isRelatedFactorTableInfo.query, this.factorQuery);
+            Object.assign(this.unRelatedFactorTableInfo.query, this.factorQuery);
+            this.factorTableInfo.refresh = Math.random();
+          }, 0);
+          break;
+        //关联因子搜索
+        case "factorSearch":
+          this.factorTableInfo.initCurpage = Math.random();
+          this.factorTableInfo.refresh = Math.random();
+          break;
+        //添加因子到站点
+        case "insert":
+          const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map( item => item.equipNo);
+          const insertData = {
+            siteCode: this.unRelatedDeviceTableInfo.query.siteCode,
+            equipNos: insertEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipInsertBatch, { data: insertData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              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
+            });
+          });
+          break;
+        //解绑因子与站点
+        case "remove":
+          const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(item => item.equipNo);
+          const removeData = {
+            siteCode: this.isRelatedDeviceTableInfo.query.siteCode,
+            equipNos: removeEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipRemoveBatch, { data: removeData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              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 =>{console.log(e)});
+          break;
         //关闭
         case "close":
           setTimeout(() => {
@@ -294,4 +489,22 @@
     },
   }
 }
-</script>
\ No newline at end of file
+</script>
+
+<style lang="scss" scoped>
+.table-title{
+  @include hl(30px,30px);
+  color: #409EFF;
+  text-align: center;
+  font-size: 16px;
+  margin-bottom: 10px;
+}
+.btn-group {
+  height: 100%;
+  @include fdaj(center, center);
+  /deep/ .el-button + .el-button {
+    margin-left: 0;
+    margin-top: 10px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/ConfigManager/factor.vue b/src/components/ConfigManager/factor.vue
new file mode 100644
index 0000000..f38f0b9
--- /dev/null
+++ b/src/components/ConfigManager/factor.vue
@@ -0,0 +1,79 @@
+<template>
+  <div class="page-data">
+    <!--搜素框-->
+    <div class="page-filter">
+      <page-filter
+        :query.sync="factorFilterInfo.query"
+        :filter-list="factorFilterInfo.list"
+        @handleClick="handleClick"
+      />
+    </div>
+    <div class="page-content">
+      <!--表格-->
+      <div class="h-100">
+        <page-table
+          tabIndex
+          pagination
+          :api-url="factorTableInfo.url"
+          :refresh="factorTableInfo.refresh"
+          :data.sync="factorTableInfo.data"
+          :query="factorFilterInfo.query"
+          :page-query="factorTableInfo.pageQuery"
+          :init-curpage="factorTableInfo.initCurpage"
+          :field-list="factorTableInfo.fieldList"
+          @handleClick="handleClick"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { message } from "./../../util/item";
+export default {
+  data() {
+    return {
+      //因子搜索相关
+      factorFilterInfo: {
+        query: {
+          searchStr: "",
+        },
+        list: [
+          {type: "input", label: "因子名称/ASCII码", value: "searchStr", hideLabel: true },
+          {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "search", show: true},
+        ]
+      },
+      //因子表格相关
+      factorTableInfo: {
+        url: this.nozzle.sysEquipConfigList, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [],
+        fieldList: [
+          { label: "因子名称", value: "codeProperty", minWidth: 150, tooltip: true },
+          { label: "因子ASCII码", value: "codeAscll", minWidth: 100, tooltip: true },
+          { label: "水文编号", value: "code", minWidth: 100, tooltip: true },
+          { label: "因子最大值", value: "maxValue", minWidth: 100, tooltip: true },
+          { label: "因子最小值", value: "minValue", minWidth: 100, tooltip: true },
+          { label: "因子单位", value: "unit", minWidth: 100, tooltip: true },
+        ]
+      }
+    }
+  },
+  mounted() {
+    this.factorTableInfo.refresh = Math.random();
+  },
+  methods: {
+    //点击事件
+    handleClick(event, data) {
+      switch (event) {
+        //设备搜索
+        case "search":
+          this.factorTableInfo.initCurpage = Math.random();
+          this.factorTableInfo.refresh = Math.random();
+          break;
+      }
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index 065f3da..31253a6 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -35,6 +35,7 @@
     </div>
     <!--弹窗-->
     <el-dialog
+      class="page-data-dialog"
       :width="dialogInfo.width"
       append-to-body
       :title="dialogInfo.title[dialogInfo.type]"
@@ -55,9 +56,10 @@
         </div>
         <div class="page-content">
           <el-row :gutter="20" class="h-100">
-            <el-col :span="10" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">未关联站点列表</div>
               <page-table
-                tabIndex
+                class="flex-1"
                 checkBox
                 pagination
                 type="unRelate"
@@ -91,9 +93,10 @@
                 >
               </div>
             </el-col>
-            <el-col :span="10" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">已关联站点列表</div>
               <page-table
-                tabIndex
+                class="flex-1"
                 checkBox
                 pagination
                 type="isRelate"
@@ -244,8 +247,8 @@
           {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: "searchProject", show: true},
-          {type: "button", label: "添加项目", btType: "primary", icon: "", event: "create", show: true, has: "m11-1-4"}
+          {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "searchProject", show: true},
+          {type: "button", label: "添加项目", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-1-4"}
         ]
       },
       //项目表格相关
@@ -269,7 +272,7 @@
           width: "240",
           btList: [
             { label: "分配权限", size: "small", type: "text", event: "permission", show: true, has: 'm11-1-1' },
-            { label: "项目关联站点", size: "small", type: "text", event: "relate", show: true, has: 'm11-1-2' },
+            { label: "关联站点", size: "small", type: "text", event: "relate", show: true, has: 'm11-1-2' },
             { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-1-3' },
             { label: "删除", size: "small", type: "text", event: "delete", show: true, has: 'm11-1-5' }
           ]
@@ -329,10 +332,9 @@
         xmlxList: [{ key: "合同项目", value: "0" }, { key: "临测项目", value: "1" }],
         groupList: [],
         deptTree: [],
-        roleTree: [],
         userType: [{ key: "普通用户", value: 0 }, { key: "超级管理员", value: 1 }],
         statusList: [{ key: "未管理", value: 0 }, { key: "管理中", value: 1 }],
-        roleList: [{ key: "111", value: 0 }, { key: "2222", value: 1 }],
+        roleList: [],
       },
       //用户弹窗相关
       userDialogInfo: {
@@ -679,7 +681,6 @@
           this.dialogInfo.visible = true;
           this.dialogInfo.type = event;
           this.listTypeInfo.deptTree = this.allDept;
-          this.listTypeInfo.roleTree = this.allRole;
           this.needHandleProjectId = data.platformCode;
           this.permissionFilterInfo.query.platformCode = data.platformCode;
           setTimeout(() => {
@@ -1005,14 +1006,16 @@
   .el-dialog__body {
     @include fd();
     flex: 1;
-    padding: 20px;
+    padding-bottom: 0;
     overflow-y: auto;
   }
-  .el-pagination__sizes,
-  .el-pagination__total,
-  .el-pagination__jump {
-    display: none;
-  }
+}
+.table-title{
+  @include hl(30px,30px);
+  color: #409EFF;
+  text-align: center;
+  font-size: 16px;
+  margin-bottom: 10px;
 }
 .userDialog {
   /deep/ .el-form-item {
diff --git a/src/components/common/PageFilter/index.vue b/src/components/common/PageFilter/index.vue
index a4e93b0..614a410 100644
--- a/src/components/common/PageFilter/index.vue
+++ b/src/components/common/PageFilter/index.vue
@@ -238,4 +238,7 @@
       z-index: 10;
     }
   }
+  /deep/ .el-icon-date:before{
+    color: #fff;
+  }
 </style>
diff --git a/src/components/common/PageForm/index.vue b/src/components/common/PageForm/index.vue
index ddbc8e0..10915fa 100644
--- a/src/components/common/PageForm/index.vue
+++ b/src/components/common/PageForm/index.vue
@@ -243,12 +243,6 @@
         }
       },
       deep: true, // 深度监听
-    },
-    rules: {
-      handler(newVal, oldVal) {
-        console.log(6666,newVal, oldVal);
-      },
-      deep: true,
     }
   },
   mounted () {
@@ -362,6 +356,9 @@
     .el-form-item__label{
       text-align: right !important;
     }
+    .el-icon-date:before{
+      color: #fff;
+    }
   }
   /deep/ .el-form-block{
     width: 100%;
diff --git a/src/components/common/PageTable/index.vue b/src/components/common/PageTable/index.vue
index 0536b03..b992a54 100644
--- a/src/components/common/PageTable/index.vue
+++ b/src/components/common/PageTable/index.vue
@@ -102,7 +102,7 @@
         layout="total, sizes, prev, pager, next, jumper"
         :total="listInfo.total"
         :pager-count="5"
-        :page-sizes="[10, 50, 100, 500, 1000]"
+        :page-sizes="[10, 20, 30, 40]"
         :page-size="listInfo.query.size"
         :current-page.sync="listInfo.query.current"
         @current-change="handleCurrentChange"
diff --git a/src/components/index.vue b/src/components/index.vue
index e9b9720..031723d 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -118,6 +118,11 @@
                 v-has="'m11-3'"
                 >设备管理</el-menu-item
               >
+              <el-menu-item
+                index="/ConfigManager/factor"
+                v-has="'m11-4'"
+                >因子管理</el-menu-item
+              >
             </el-submenu>
             <el-submenu index="5" v-has="'m4'">
               <template slot="title">
diff --git a/src/components/sys/user.vue b/src/components/sys/user.vue
index 248031e..a3141c4 100644
--- a/src/components/sys/user.vue
+++ b/src/components/sys/user.vue
@@ -3,7 +3,7 @@
     <div id="UserTop">
       <el-input placeholder="请输入用户名称" v-model="UserValue" clearable></el-input>
       <el-button type="primary" icon="el-icon-search" @click="loadGridData()" v-has="'Search'">搜索</el-button>
-      <el-button type="primary" icon="el-icon-plus" @click="handleClick('AddUser')" v-has="'Search'">新增用户</el-button>
+      <el-button type="primary" icon="el-icon-plus" @click="handleClick('AddUser')" v-has="'m9-1-1'">新增用户</el-button>
     </div>
     <div
       id="UserCentent"
@@ -97,8 +97,8 @@
       //弹窗相关
       dialogInfo:{
         title: {
-          update: '修改',
-          AddUser: '新增'
+          update: '修改用户',
+          AddUser: '添加用户'
         },
         visible: false,
         btLoading: false,
@@ -117,7 +117,7 @@
           login: '',
           pwd: '',
           realName: '', //用户名称
-          userType: undefined, //类型
+          userType: 0, //类型
           mobile: '', //电话
           orgId: undefined, //组织
           roleId: undefined, //角色
@@ -127,7 +127,7 @@
           {label:'登录密码',value:'pwd',type:'password'},
           {label:'用户名称',value:'realName',type:'input',required:true},
           {label:'电话',value:'mobile',type:'input',validator:checkPhone},
-          {label:'用户类型',value:'userType',type:'select',list:'userType',required:true},
+          {label:'用户类型',value:'userType',type:'select',list:'userType',required:true,disabled:true},
           {label:'所属组织',value:'orgId',type:'treeselect',list:'deptTree',required:true},
           {label:'所属角色',value:'roleId',type:'select',list:'roleList',required:true}
         ],
@@ -198,6 +198,15 @@
         case 'AddUser':
           dialogInfo.type = event;
           dialogInfo.visible = true;
+          this.formInfo.fieldList.forEach(item =>{
+            if(item.value === "pwd") {
+              item.required = true;
+            }
+          })
+          this.initRules();
+          setTimeout(() => {
+            this.formInfo.ref.clearValidate();
+          }, 0);
           break
         //编辑用户
         case 'update':
@@ -207,6 +216,12 @@
               formInfo.data[key] = data[key];
             }
           }
+          this.formInfo.fieldList.forEach(item =>{
+            if(item.value === "pwd") {
+              item.required = false;
+            }
+          })
+          this.initRules();
           dialogInfo.visible = true;
           break
         //删除用户
@@ -315,7 +330,7 @@
         login: '',
         pwd: '',
         realName: '', //用户名称
-        userType: undefined, //类型
+        userType: 0, //类型
         mobile: '', //电话
         orgId: undefined, //组织
         roleId: undefined, //角色

diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index b4e4a8f..440a79e 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -78,6 +78,15 @@
   background: transparent;
 }
 /****页面通用样式****/
+.flex{
+  display: flex;
+}
+.flex-1{
+  flex: 1;
+}
+.flex-d{
+  flex-direction: column;
+}
 .page-data {
   display: flex;
   flex-direction: column;
@@ -108,10 +117,10 @@
   flex-direction: column;
   flex: 1;
   padding: 20px;
+  padding-bottom: 0 !important;
   overflow-y: auto;
 }
 .page-data-dialog .el-pagination__sizes,
-.page-data-dialog .el-pagination__total,
 .page-data-dialog .el-pagination__jump{
-  display: none;
+  display: none !important;
 }
\ No newline at end of file
diff --git a/src/assets/css/mixin.css b/src/assets/css/mixin.css
deleted file mode 100644
index 9e97d02..0000000
--- a/src/assets/css/mixin.css
+++ /dev/null
@@ -1 +0,0 @@
-/* No CSS *//*# sourceMappingURL=mixin.css.map */
\ No newline at end of file
diff --git a/src/assets/css/mixin.css.map b/src/assets/css/mixin.css.map
deleted file mode 100644
index 356f200..0000000
--- a/src/assets/css/mixin.css.map
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "version": 3,
-    "mappings": "",
-    "sources": [
-        "mixin.scss"
-    ],
-    "names": [],
-    "file": "mixin.css"
-}
\ No newline at end of file
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 219a678..281044c 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -1,107 +1,37 @@
 <template>
-  <div id="pagetwo">
-    <div class="form">
-      <el-input
-        v-model="searchStr"
-        placeholder="请输入站点编号或站点名称"
-        clearable
-        @change="handleChangeSearch"
-      ></el-input>
-      <el-date-picker
-        v-model="startDate"
-        value-format="yyyy-MM-dd"
-        :picker-options="pickerOptionsStart"
-        type="date"
-        :clearable="true"
-        placeholder="请选择开始日期"
+  <div id="pagetwo" class="page-data">
+    <!--搜素框-->
+    <div class="page-filter">
+      <page-filter
+        :query.sync="siteFilterInfo.query"
+        :filter-list="siteFilterInfo.list"
+        @handleClick="handleClick"
       />
-      <el-date-picker
-        v-model="endDate"
-        value-format="yyyy-MM-dd"
-        :picker-options="pickerOptionsEnd"
-        type="date"
-        :clearable="true"
-        placeholder="请选择结束日期"
-      />
-      <el-button
-        type="primary"
-        icon="el-icon-search"
-        @click="search"
-        v-has="'Search'"
-        >查询</el-button
-      >
-      <el-button
-        type="primary"
-        icon="el-icon-circle-plus-outline"
-        @click="addform('ruleForm')"
-        v-has="'m11-2-1'"
-        >添加站点</el-button
-      >
     </div>
-
-    <el-table :data="listExtend" style="width: 100%; height: calc(100% - 82px)">
-      <el-table-column
-        type="index"
-        label="序号"
-        width="70"
-      ></el-table-column>
-      <el-table-column
-        prop="stCode"
-        label="站点编号"
-        max-width="120"
-        show-overflow-tooltip
-      ></el-table-column>
-      <el-table-column
-        prop="stName"
-        label="站点名称"
-        show-overflow-tooltip
-        max-width="150"
-      ></el-table-column>
-      <el-table-column label="站点类型" width="120">
-        <template slot-scope="scope">
-          <div>
-            <span v-if="scope.row.stationType == 0">水质站</span>
-            <span v-if="scope.row.stationType == 1">水位站</span>
-            <span v-if="scope.row.stationType == 2">流量站</span>
-          </div>
-        </template></el-table-column
-      >
-      <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"
-            size="small"
-            @click="EditFZ(scope.$index, scope.row)"
-            style="margin: 0 10px"
-            v-has="'m11-2-2'"
-            >修改</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
+    <div class="page-content">
+      <!--表格-->
+      <div class="h-100">
+        <page-table
+          tabIndex
+          pagination
+          :api-url="siteTableInfo.url"
+          :refresh="siteTableInfo.refresh"
+          :data.sync="siteTableInfo.data"
+          :query="siteFilterInfo.query"
+          :page-query="siteTableInfo.pageQuery"
+          :list-type-info="listTypeInfo"
+          :init-curpage="siteTableInfo.initCurpage"
+          :field-list="siteTableInfo.fieldList"
+          :handle="siteTableInfo.handle"
+          @handleClick="handleClick"
+        >
+          <!-- 自定义插槽显示状态 -->
+          <template v-slot:col-equips="scope">
+            <el-button type="text" size="small" @click="handleClick('look',scope.row)">查看设备</el-button>
+          </template>
+        </page-table>
+      </div>
+    </div>
 
     <!-- 新增/修改的弹出框 -->
     <el-dialog
@@ -266,72 +196,138 @@
       class="page-data-dialog"
       :title="dialogInfo.title[dialogInfo.type]"
       :visible.sync="dialogInfo.visible"
-      :width="dialogInfo.width"
+      width="80%"
       :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"
-      />
+      <template v-if="dialogInfo.type === 'look'">
+        <div class="page-filter">
+          <el-form :inline="true" :model="deviceRelatedQuery" ref="deviceRelatedQuery" size="medium">
+            <el-form-item label="">
+              <el-input v-model="deviceRelatedQuery.searchStr" placeholder="请输入设备编号/厂家" clearable></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="medium" @click="handleClick('deviceSearch')">查询</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="page-content">
+          <el-row :gutter="20" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">未关联设备列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="unRelated"
+                :api-url="deviceTableInfo.url"
+                :refresh="deviceTableInfo.refresh"
+                :data.sync="unRelatedDeviceTableInfo.data"
+                :query="unRelatedDeviceTableInfo.query"
+                :init-curpage="deviceTableInfo.initCurpage"
+                :field-list="deviceTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+            <el-col :span="4" class="h-100">
+              <div class="btn-group">
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-right"
+                  :disabled="isCanInsertDevice"
+                  @click="handleClick('insert')"
+                  >添加</el-button
+                >
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-left"
+                  :disabled="isCanRemoveDevice"
+                  @click="handleClick('remove')"
+                  >移除</el-button
+                >
+              </div>
+            </el-col>
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">已关联设备列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="isRelated"
+                :api-url="deviceTableInfo.url"
+                :refresh="deviceTableInfo.refresh"
+                :data.sync="isRelatedDeviceTableInfo.data"
+                :query="isRelatedDeviceTableInfo.query"
+                :init-curpage="deviceTableInfo.initCurpage"
+                :field-list="deviceTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+          </el-row>
+        </div>
+      </template>
     </page-dialog>
-    <el-pagination
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page="currentPage"
-      :page-sizes="[10, 20, 30, 40]"
-      :page-size="PageSize"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="AllTotal"
-    >
-    </el-pagination>
   </div>
 </template>
 <script>
 import axios from "axios";
-
+import { mapGetters } from "vuex";
 export default {
-  name: "StatisticalReport",
   data() {
     return {
+      //站点搜索相关
+      siteFilterInfo: {
+        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: "el-icon-search", event: "search", show: true},
+          {type: "button", label: "添加站点", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-2-1"}
+        ]
+      },
+      //站点表格相关
+      siteTableInfo: {
+        url: this.nozzle.listExtend, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [],
+        fieldList: [
+          { label: "站点编号", value: "stCode", minWidth: 120, tooltip: true },
+          { label: "站点名称", value: "stName", minWidth: 120, tooltip: true },
+          { label: "站点类型", value: "stationTypeName", width: 120 },
+          { label: "站点安装时间", value: "createTime", minWidth: 120, tooltip: true },
+          { label: "安装人", value: "person", width: 120 },
+          { label: "关联设备", value: "equips", width: 100, type: "slot" },
+          { label: "首次数据接入时间", value: "tt", minWidth: 120, tooltip: true },
+        ],
+        handle: {
+          fixed: "right",
+          label: "操作",
+          width: "80",
+          btList: [
+            { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-2-2' }
+          ]
+        }
+      },
+      //列表相关
+      listTypeInfo: {},
       loadingdelet: undefined,
       loading: false,
       timer: null,
       dialogImageUrl: "",
       dialogVisible: false,
-      PageSize: 10,
-      AllTotal: 0,
-      currentPage: 1,
       title: "站点管理",
-      listExtend: [], // 站点管理的返回数据
       siteTypeList: [], //弹框里面站点类型列表
-      searchStr: "",
-      file: [],
-      startDate: "",
-      endDate: "",
-      pickerOptionsStart: {
-        //结束时间不能大于开始时间
-        disabledDate: time => {
-          if (this.endDate) {
-            return time.getTime() > new Date(this.endDate).getTime();
-          }
-        }
-      },
-      pickerOptionsEnd: {
-        disabledDate: time => {
-          return time.getTime() < new Date(this.startDate).getTime();
-        }
-      },
-      List: [],
-      ledlist: [],
       yzaddflag: false,
       ruleForm: {
         id: "", //站点ID
@@ -431,7 +427,7 @@
       //弹窗相关
       dialogInfo:{
         title: {
-          look: '关联设备列表'
+          look: ''
         },
         width: '60%',
         visible: false,
@@ -441,65 +437,65 @@
           {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: '', //接口地址
+        url: this.nozzle.sysEquipRelatedList, //接口地址
         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: "",
+      //已关联设备表格相关
+      isRelatedDeviceTableInfo: {
+        data: [],
+        query: {
+          sign: ""
+        },
+        selectList: []
+      },
+      //未关联设备表格相关
+      unRelatedDeviceTableInfo: {
+        data: [],
+        query: {
+          sign: "unbound"
+        },
+        selectList: []
+      },
+      //设备关联过滤相关
+      deviceRelatedQuery: {
+        searchStr: "",
+        siteCode: ""
+      }
     };
   },
   mounted() {
-    this.getsyscityList();
-    this.getlistExtend();
+    this.siteTableInfo.refresh = Math.random();
     this.getsityType();
     this.getCurrentUserProject(); //获取当前用户所绑定的项目
   },
+  computed: {
+    //移除按钮是否可点击
+    isCanRemoveDevice() {
+      return this.isRelatedDeviceTableInfo.selectList.length ? false : true;
+    },
+    //添加按钮是否可点击
+    isCanInsertDevice() {
+      return this.unRelatedDeviceTableInfo.selectList.length ? false : true;
+    },
+    ...mapGetters(["allDept", "allRole", "allCity"])
+  },
   watch: {
     "ruleForm.area": {
       handler(newVal, oldVal) {
         if (this.$refs.cascader) {
           let children = this.$refs.cascader.getCheckedNodes();
-          // console.log(children);
           if (
             children.length &&
             children[0].children &&
             children[0].children.length < 1
           ) {
-            // console.log(9999);
             this.$refs.cascader.dropDownVisible = false;
           }
         }
@@ -516,30 +512,18 @@
     "dialogInfo.visible"(val) {
       if(!val) {
         this.deviceTableInfo.data = [];
+        this.deviceRelatedQuery.searchStr = "";
         this.dialogInfo.btLoading = false;
       }
+    },
+    "deviceRelatedQuery.searchStr"(val) {
+      Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+      Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
     }
   },
   methods: {
-    //将空的children置为undefined,避免在没有下一级数据的情况下显示暂无数据
-    removeEmptyChild(arr) {
-      arr.forEach(item => {
-        if (!item.children || item.children.length < 1) {
-          item.children = undefined;
-        } else {
-          this.removeEmptyChild(item.children);
-        }
-      });
-      return arr;
-    },
-    handleChangeSearch() {
-      this.currentPage = 1;
-      this.getlistExtend();
-    },
     //上传头像
     fileChange(file) {
-      // console.log(file.size, file.raw.type);
-      // const isJPG = file.raw.type === "image/jpeg";
       this.loading = true;
       const isLt1M = file.size / 1024 / 1024 < 1;
       if (file.raw.type != "image/jpeg" && file.raw.type != "image/png") {
@@ -559,25 +543,24 @@
       let config = {
         headers: { "Content-Type": "multipart/form-data" }
       };
-      axios
-        .post(this.nozzle.upload, formdata, config)
-        .then(res => {
-          if (res.data.code == 1) {
-            this.loading = false;
-            this.$message({
-              message: "上传图片成功！",
-              type: "success"
-            });
-            this.ruleForm.fileList.push(res.data.data[0]);
-          }
-        })
-        .catch(res => {
+      axios.post(this.nozzle.upload, formdata, config).then(res => {
+        if (res.data.code == 1) {
           this.loading = false;
           this.$message({
-            message: "服务器问题！请重试！",
-            type: "warning"
+            message: "上传图片成功！",
+            type: "success"
           });
+          this.ruleForm.fileList.push(res.data.data[0]);
+          this.siteTableInfo.refresh = Math.random();
+        }
+      })
+      .catch(res => {
+        this.loading = false;
+        this.$message({
+          message: "服务器问题！请重试！",
+          type: "warning"
         });
+      });
     },
     // 删除图片按钮
     deleteImg(fileNo) {
@@ -633,39 +616,24 @@
       this.dialogImageUrl = file.fileCloudStorageKey;
       this.dialogVisible = true;
     },
-    // 获取站点列表
-    async getlistExtend() {
-      const { data } = await this.$http.post(this.nozzle.listExtend, {
-        current: this.currentPage,
-        data: {
-          searchStr: this.searchStr,
-          startDate: this.startDate,
-          endDate: this.endDate
-        },
-        size: this.PageSize
-      });
-      this.listExtend = data.data.list;
-      this.AllTotal = data.data.total;
-    },
-    // 搜索查询按钮
-    search() {
-      this.currentPage = 1;
-      this.getlistExtend();
-    },
-    deleteRow(index, rows) {
-      rows.splice(index, 1);
-    },
     // 弹框提交表单按钮
     saveOru(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
-          this.$http
-            .post(this.nozzle.saveOrupdate, {
-              data: this.ruleForm
-            })
-            .then(res => {
+          this.$http.post(this.nozzle.saveOrupdate, {
+            data: this.ruleForm
+          })
+          .then(res => {
+            if(res.data.code === 1) {
+              this.siteTableInfo.refresh = Math.random();
               this.yzaddflag = false;
-            });
+            }
+            this.$message({
+              message: res.data.msg,
+              type: res.data.code === 1 ? 'success' : 'error',
+              showClose: true,
+            })
+          });
         }
       });
     },
@@ -674,7 +642,6 @@
       this.yzaddflag = false;
       this.$refs[formName].resetFields();
     },
-
     visiblechange(visible) {
       if (visible) {
         this.timer = setInterval(() => {
@@ -690,34 +657,6 @@
         clearInterval(this.timer);
       }
     },
-    // 添加站点
-    addform(formName) {
-      this.yzaddflag = true;
-      // 获取地区列表
-      this.title = "新增站点";
-    },
-    // 操作里面的修改弹窗
-    EditFZ(index, rows) {
-      // 获取地区列表
-      for (let key in rows) {
-        if (key === "stationType") {
-          rows[key] = rows[key].toString();
-        }
-        this.ruleForm[key] = rows[key];
-      }
-      this.yzaddflag = true;
-      this.title = "修改站点";
-      this.FenZuflag2type = 2;
-      this.AddFZInput = rows.groupName;
-      this.ClickID = rows.id;
-    },
-    // 获取地区列表数据
-    async getsyscityList() {
-      const { data } = await this.$http.post(this.nozzle.syscity);
-
-      let arr = this.removeEmptyChild(data.data);
-      this.syscityList = data.data;
-    },
     //获取站点类型列表
     async getsityType() {
       const { data } = await this.$http.post(this.nozzle.sityType, {
@@ -745,43 +684,98 @@
         }
       })
     },
+    //表格checkbox选择事件
+    handleEvent(event, data) {
+      switch (event) {
+        case "isRelated":
+          this.isRelatedDeviceTableInfo.selectList = data;
+          break;
+        case "unRelated":
+          this.unRelatedDeviceTableInfo.selectList = data;
+          break;
+      }
+    },
     //点击事件
     handleClick(event, data, index){
       switch(event) {
+        //站点搜索
+        case "search":
+          this.siteTableInfo.initCurpage = Math.random();
+          this.siteTableInfo.refresh = Math.random();
+          break;
+        //添加站点
+        case "create":
+          this.yzaddflag = true;
+          this.title = "新增站点";
+          this.syscityList = this.removeEmptyChild(this.allCity);
+          break;
+        //编辑站点
+        case "update":
+          this.title = "修改站点";
+          for (let key in data) {
+            if (key === "stationType") {
+              data[key] = data[key].toString();
+            }
+            this.ruleForm[key] = data[key];
+          }
+          this.syscityList = this.removeEmptyChild(this.allCity);
+          this.yzaddflag = true;
+          break;
         //查看关联设备
         case "look":
-          this.dialogInfo.visible = true;
           this.dialogInfo.type = event;
-          this.deviceTableInfo.data = data.equips;
-          this.needHandleSiteCode = data.stCode;
+          this.deviceRelatedQuery.siteCode = data.stCode;
+          this.dialogInfo.visible = true;
+          setTimeout(() => {
+            Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+            Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+            this.deviceTableInfo.refresh = Math.random();
+          }, 0);
+          break;
+        //关联设备搜索
+        case "deviceSearch":
+          this.deviceTableInfo.initCurpage = Math.random();
+          this.deviceTableInfo.refresh = Math.random();
+          break;
+        //添加设备到站点
+        case "insert":
+          const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map( item => item.equipNo);
+          const insertData = {
+            siteCode: this.unRelatedDeviceTableInfo.query.siteCode,
+            equipNos: insertEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipInsertBatch, { data: insertData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              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
+            });
+          });
           break;
         //解绑设备与站点
         case "remove":
-          this.$confirm("此操作将解除设备和站点的绑定关系, 是否继续?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(res =>{
-            const params = {
-              data: {
-                siteCode: this.needHandleSiteCode,
-                equipNos: [data.equipNo]
-              }
+          const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(item => item.equipNo);
+          const removeData = {
+            siteCode: this.isRelatedDeviceTableInfo.query.siteCode,
+            equipNos: removeEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipRemoveBatch, { data: removeData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              this.deviceTableInfo.refresh = Math.random();
+              this.deviceTableInfo.initCurpage = Math.random();
             }
-            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(() =>{})
+            this.$message({
+              message: res.data.msg,
+              type: res.data.code === 1 ? "success" : "error",
+              showClose: true
+            });
+          }).catch(e =>{console.log(e)});
           break;
         //关闭
         case "close":
@@ -820,19 +814,21 @@
       };
       this.$refs.cascader.$refs.panel.activePath = [];
       this.$refs.cascader.$refs.panel.clearCheckedNodes();
-      // this.getlistExtend();
     },
     handleChange(value) {
       // 取选中数组的最后一项的id
       this.ruleForm.area = value.slice(-1)[0];
     },
-    handleSizeChange(val) {
-      this.PageSize = val;
-      this.getlistExtend();
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getlistExtend();
+    //将空的children置为undefined,避免在没有下一级数据的情况下显示暂无数据
+    removeEmptyChild(arr) {
+      arr.forEach(item => {
+        if (!item.children || item.children.length < 1) {
+          item.children = undefined;
+        } else {
+          this.removeEmptyChild(item.children);
+        }
+      });
+      return arr;
     }
   },
   destroyed() {
@@ -841,15 +837,10 @@
 };
 </script>
 <style lang="scss" scoped>
-/deep/ .el-pagination .el-pager li.active {
-  background-color: #409eff !important;
-  cursor: default;
-}
 .imgtype {
   width: 150px;
   height: 100px;
 }
-
 /deep/ .el-upload-list {
   display: none;
 }
@@ -858,7 +849,6 @@
   margin: 0 20px 20px 0;
   position: relative;
 }
-
 .deleteSpan {
   position: absolute;
   display: inline-block;
@@ -893,26 +883,33 @@
   width: 200px;
   margin: 0 10px;
 }
-
-.title {
-  height: 50px;
-  line-height: 50px;
+.title, .table-title{
+  @include hl(30px,30px);
+  color: #409EFF;
   text-align: center;
   font-size: 16px;
+  margin-bottom: 10px;
 }
-
 .tableSection {
   padding: 10px;
   background: rgba(270, 255, 255, 0.05);
 }
 /deep/ .el-dialog .el-dialog__body {
   text-align: left;
+  padding-bottom: 0;
 }
-
 .el-dialog .selectInput {
   width: 30% !important;
 }
 .el-dialog .selectInput .el-select-dropdown__empty {
   width: 100% !important;
 }
+.btn-group {
+  height: 100%;
+  @include fdaj(center, center);
+  /deep/ .el-button + .el-button {
+    margin-left: 0;
+    margin-top: 10px;
+  }
+}
 </style>
diff --git a/src/components/ConfigManager/device.vue b/src/components/ConfigManager/device.vue
index f800811..bc4ccda 100644
--- a/src/components/ConfigManager/device.vue
+++ b/src/components/ConfigManager/device.vue
@@ -35,22 +35,97 @@
     </div>
     <!--弹窗-->
     <page-dialog
+      class="page-data-dialog"
       :title="dialogInfo.title[dialogInfo.type]"
       :visible.sync="dialogInfo.visible"
-      :width="dialogInfo.width"
+      :width="dialogInfo.type === 'relate' ? '80%' : '500px'"
       :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"
-      />
+      <!--关联因子-->
+      <template v-if="dialogInfo.type === 'relate'">
+        <div class="page-filter">
+          <el-form :inline="true" :model="factorQuery" ref="factorQuery" size="medium">
+            <el-form-item label="">
+              <el-input v-model="factorQuery.searchStr" placeholder="因子名称/ASCII码" clearable></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="medium" @click="handleClick('factorSearch')">查询</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="page-content">
+          <el-row :gutter="20" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">未关联因子列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="unRelated"
+                :api-url="factorTableInfo.url"
+                :refresh="factorTableInfo.refresh"
+                :data.sync="unRelatedFactorTableInfo.data"
+                :query="unRelatedFactorTableInfo.query"
+                :init-curpage="factorTableInfo.initCurpage"
+                :field-list="factorTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+            <el-col :span="4" class="h-100">
+              <div class="btn-group">
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-right"
+                  :disabled="isCanInsertFactor"
+                  @click="handleClick('insert')"
+                  >添加</el-button
+                >
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-left"
+                  :disabled="isCanRemoveFactor"
+                  @click="handleClick('remove')"
+                  >移除</el-button
+                >
+              </div>
+            </el-col>
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">已关联因子列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="isRelated"
+                :api-url="factorTableInfo.url"
+                :refresh="factorTableInfo.refresh"
+                :data.sync="isRelatedFactorTableInfo.data"
+                :query="isRelatedFactorTableInfo.query"
+                :init-curpage="factorTableInfo.initCurpage"
+                :field-list="factorTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+          </el-row>
+        </div>
+      </template>
+      <!--新增/修改表单-->
+      <template v-else>
+        <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"
+        />
+      </template>
     </page-dialog>
   </div>
 </template>
@@ -80,8 +155,8 @@
           {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"}
+          {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "search", show: true},
+          {type: "button", label: "添加设备", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-3-1"}
         ]
       },
       //设备表格相关
@@ -89,9 +164,7 @@
         url: this.nozzle.sysEquipList, //接口地址
         refresh: 1,
         initCurpage: 1,
-        data: [
-          {equipNo:1000,equipDesc:"3333",equipFactory:'4444'}
-        ],
+        data: [],
         fieldList: [
           { label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
           { label: "设备描述", value: "equipDesc", minWidth: 150, tooltip: true },
@@ -105,8 +178,9 @@
         handle: {
           fixed: "right",
           label: "操作",
-          width: "120",
+          width: "180",
           btList: [
+            { label: "关联因子", size: "small", type: "text", event: "relate", show: true, has: 'm11-3-4' },
             { 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' }
           ]
@@ -143,18 +217,60 @@
       //弹窗相关
       dialogInfo:{
         title: {
-          update: '编辑设备',
-          create: '添加设备'
+          update: "编辑设备",
+          create: "添加设备",
+          relate: "",
         },
-        width: '500px',
+        width: "500px",
         visible: false,
         btLoading: false,
-        type: '',
+        type: "",
         btList: [
-          {label:'关闭',type:'',icon:'',event:'close',show:true},
-          {label:'保存',type:'primary',icon:'',event:'save',show:true,loading:true}
+          {label:"关闭",type:"",icon:"",event:"close",show:true},
+          {label:"保存",type:"primary",icon:"",event:"save",show:true,loading:true}
         ]
       },
+      //因子表格通用相关
+      factorTableInfo: {
+        url: this.nozzle.sysEquipFactorList, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        fieldList: [
+          { label: "因子名称", value: "codeProperty", minWidth: 100, tooltip: true },
+          { label: "因子ASCII码", value: "codeAscll", minWidth: 100, tooltip: true },
+        ]
+      },
+      //已关联因子表格相关
+      isRelatedFactorTableInfo: {
+        data: [],
+        query: {
+          sign: ""
+        },
+        selectList: []
+      },
+      //未关联因子表格相关
+      unRelatedFactorTableInfo: {
+        data: [],
+        query: {
+          sign: "unbound"
+        },
+        selectList: []
+      },
+      //设备关联过滤相关
+      factorQuery: {
+        searchStr: "",
+        equipNo: ""
+      }
+    }
+  },
+  computed: {
+    //移除按钮是否可点击
+    isCanRemoveFactor() {
+      return this.isRelatedFactorTableInfo.selectList.length ? false : true;
+    },
+    //添加按钮是否可点击
+    isCanInsertFactor() {
+      return this.unRelatedFactorTableInfo.selectList.length ? false : true;
     }
   },
   watch: {
@@ -165,8 +281,20 @@
         }
         this.resetForm();
         this.btnLoading = false;
+        this.factorQuery.searchStr = "";
       }
     },
+    "dialogInfo.type"(val) {
+      this.dialogInfo.btList.forEach(item =>{
+        if(item.event === "save") {
+          item.show = val === "relate" ? false : true;
+        }
+      })
+    },
+    "factorQuery.searchStr"(val) {
+      Object.assign(this.isRelatedFactorTableInfo.query, this.factorQuery);
+      Object.assign(this.unRelatedFactorTableInfo.query, this.factorQuery);
+    }
   },
   created() {
     this.initSiteData();
@@ -198,6 +326,17 @@
         }
       })
     },
+    //表格checkbox选择事件
+    handleEvent(event, data) {
+      switch (event) {
+        case "isRelated":
+          this.isRelatedFactorTableInfo.selectList = data;
+          break;
+        case "unRelated":
+          this.unRelatedFactorTableInfo.selectList = data;
+          break;
+      }
+    },
     //点击事件
     handleClick(event, data) {
       switch (event) {
@@ -243,6 +382,62 @@
             })
           }).catch(() =>{})
           break;
+        //查看关联因子
+        case "relate":
+          this.dialogInfo.type = event;
+          this.factorQuery.equipNo = data.equipNo;
+          this.dialogInfo.visible = true;
+          setTimeout(() => {
+            Object.assign(this.isRelatedFactorTableInfo.query, this.factorQuery);
+            Object.assign(this.unRelatedFactorTableInfo.query, this.factorQuery);
+            this.factorTableInfo.refresh = Math.random();
+          }, 0);
+          break;
+        //关联因子搜索
+        case "factorSearch":
+          this.factorTableInfo.initCurpage = Math.random();
+          this.factorTableInfo.refresh = Math.random();
+          break;
+        //添加因子到站点
+        case "insert":
+          const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map( item => item.equipNo);
+          const insertData = {
+            siteCode: this.unRelatedDeviceTableInfo.query.siteCode,
+            equipNos: insertEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipInsertBatch, { data: insertData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              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
+            });
+          });
+          break;
+        //解绑因子与站点
+        case "remove":
+          const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(item => item.equipNo);
+          const removeData = {
+            siteCode: this.isRelatedDeviceTableInfo.query.siteCode,
+            equipNos: removeEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipRemoveBatch, { data: removeData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              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 =>{console.log(e)});
+          break;
         //关闭
         case "close":
           setTimeout(() => {
@@ -294,4 +489,22 @@
     },
   }
 }
-</script>
\ No newline at end of file
+</script>
+
+<style lang="scss" scoped>
+.table-title{
+  @include hl(30px,30px);
+  color: #409EFF;
+  text-align: center;
+  font-size: 16px;
+  margin-bottom: 10px;
+}
+.btn-group {
+  height: 100%;
+  @include fdaj(center, center);
+  /deep/ .el-button + .el-button {
+    margin-left: 0;
+    margin-top: 10px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/ConfigManager/factor.vue b/src/components/ConfigManager/factor.vue
new file mode 100644
index 0000000..f38f0b9
--- /dev/null
+++ b/src/components/ConfigManager/factor.vue
@@ -0,0 +1,79 @@
+<template>
+  <div class="page-data">
+    <!--搜素框-->
+    <div class="page-filter">
+      <page-filter
+        :query.sync="factorFilterInfo.query"
+        :filter-list="factorFilterInfo.list"
+        @handleClick="handleClick"
+      />
+    </div>
+    <div class="page-content">
+      <!--表格-->
+      <div class="h-100">
+        <page-table
+          tabIndex
+          pagination
+          :api-url="factorTableInfo.url"
+          :refresh="factorTableInfo.refresh"
+          :data.sync="factorTableInfo.data"
+          :query="factorFilterInfo.query"
+          :page-query="factorTableInfo.pageQuery"
+          :init-curpage="factorTableInfo.initCurpage"
+          :field-list="factorTableInfo.fieldList"
+          @handleClick="handleClick"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { message } from "./../../util/item";
+export default {
+  data() {
+    return {
+      //因子搜索相关
+      factorFilterInfo: {
+        query: {
+          searchStr: "",
+        },
+        list: [
+          {type: "input", label: "因子名称/ASCII码", value: "searchStr", hideLabel: true },
+          {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "search", show: true},
+        ]
+      },
+      //因子表格相关
+      factorTableInfo: {
+        url: this.nozzle.sysEquipConfigList, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [],
+        fieldList: [
+          { label: "因子名称", value: "codeProperty", minWidth: 150, tooltip: true },
+          { label: "因子ASCII码", value: "codeAscll", minWidth: 100, tooltip: true },
+          { label: "水文编号", value: "code", minWidth: 100, tooltip: true },
+          { label: "因子最大值", value: "maxValue", minWidth: 100, tooltip: true },
+          { label: "因子最小值", value: "minValue", minWidth: 100, tooltip: true },
+          { label: "因子单位", value: "unit", minWidth: 100, tooltip: true },
+        ]
+      }
+    }
+  },
+  mounted() {
+    this.factorTableInfo.refresh = Math.random();
+  },
+  methods: {
+    //点击事件
+    handleClick(event, data) {
+      switch (event) {
+        //设备搜索
+        case "search":
+          this.factorTableInfo.initCurpage = Math.random();
+          this.factorTableInfo.refresh = Math.random();
+          break;
+      }
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index 065f3da..31253a6 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -35,6 +35,7 @@
     </div>
     <!--弹窗-->
     <el-dialog
+      class="page-data-dialog"
       :width="dialogInfo.width"
       append-to-body
       :title="dialogInfo.title[dialogInfo.type]"
@@ -55,9 +56,10 @@
         </div>
         <div class="page-content">
           <el-row :gutter="20" class="h-100">
-            <el-col :span="10" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">未关联站点列表</div>
               <page-table
-                tabIndex
+                class="flex-1"
                 checkBox
                 pagination
                 type="unRelate"
@@ -91,9 +93,10 @@
                 >
               </div>
             </el-col>
-            <el-col :span="10" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">已关联站点列表</div>
               <page-table
-                tabIndex
+                class="flex-1"
                 checkBox
                 pagination
                 type="isRelate"
@@ -244,8 +247,8 @@
           {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: "searchProject", show: true},
-          {type: "button", label: "添加项目", btType: "primary", icon: "", event: "create", show: true, has: "m11-1-4"}
+          {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "searchProject", show: true},
+          {type: "button", label: "添加项目", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-1-4"}
         ]
       },
       //项目表格相关
@@ -269,7 +272,7 @@
           width: "240",
           btList: [
             { label: "分配权限", size: "small", type: "text", event: "permission", show: true, has: 'm11-1-1' },
-            { label: "项目关联站点", size: "small", type: "text", event: "relate", show: true, has: 'm11-1-2' },
+            { label: "关联站点", size: "small", type: "text", event: "relate", show: true, has: 'm11-1-2' },
             { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-1-3' },
             { label: "删除", size: "small", type: "text", event: "delete", show: true, has: 'm11-1-5' }
           ]
@@ -329,10 +332,9 @@
         xmlxList: [{ key: "合同项目", value: "0" }, { key: "临测项目", value: "1" }],
         groupList: [],
         deptTree: [],
-        roleTree: [],
         userType: [{ key: "普通用户", value: 0 }, { key: "超级管理员", value: 1 }],
         statusList: [{ key: "未管理", value: 0 }, { key: "管理中", value: 1 }],
-        roleList: [{ key: "111", value: 0 }, { key: "2222", value: 1 }],
+        roleList: [],
       },
       //用户弹窗相关
       userDialogInfo: {
@@ -679,7 +681,6 @@
           this.dialogInfo.visible = true;
           this.dialogInfo.type = event;
           this.listTypeInfo.deptTree = this.allDept;
-          this.listTypeInfo.roleTree = this.allRole;
           this.needHandleProjectId = data.platformCode;
           this.permissionFilterInfo.query.platformCode = data.platformCode;
           setTimeout(() => {
@@ -1005,14 +1006,16 @@
   .el-dialog__body {
     @include fd();
     flex: 1;
-    padding: 20px;
+    padding-bottom: 0;
     overflow-y: auto;
   }
-  .el-pagination__sizes,
-  .el-pagination__total,
-  .el-pagination__jump {
-    display: none;
-  }
+}
+.table-title{
+  @include hl(30px,30px);
+  color: #409EFF;
+  text-align: center;
+  font-size: 16px;
+  margin-bottom: 10px;
 }
 .userDialog {
   /deep/ .el-form-item {
diff --git a/src/components/common/PageFilter/index.vue b/src/components/common/PageFilter/index.vue
index a4e93b0..614a410 100644
--- a/src/components/common/PageFilter/index.vue
+++ b/src/components/common/PageFilter/index.vue
@@ -238,4 +238,7 @@
       z-index: 10;
     }
   }
+  /deep/ .el-icon-date:before{
+    color: #fff;
+  }
 </style>
diff --git a/src/components/common/PageForm/index.vue b/src/components/common/PageForm/index.vue
index ddbc8e0..10915fa 100644
--- a/src/components/common/PageForm/index.vue
+++ b/src/components/common/PageForm/index.vue
@@ -243,12 +243,6 @@
         }
       },
       deep: true, // 深度监听
-    },
-    rules: {
-      handler(newVal, oldVal) {
-        console.log(6666,newVal, oldVal);
-      },
-      deep: true,
     }
   },
   mounted () {
@@ -362,6 +356,9 @@
     .el-form-item__label{
       text-align: right !important;
     }
+    .el-icon-date:before{
+      color: #fff;
+    }
   }
   /deep/ .el-form-block{
     width: 100%;
diff --git a/src/components/common/PageTable/index.vue b/src/components/common/PageTable/index.vue
index 0536b03..b992a54 100644
--- a/src/components/common/PageTable/index.vue
+++ b/src/components/common/PageTable/index.vue
@@ -102,7 +102,7 @@
         layout="total, sizes, prev, pager, next, jumper"
         :total="listInfo.total"
         :pager-count="5"
-        :page-sizes="[10, 50, 100, 500, 1000]"
+        :page-sizes="[10, 20, 30, 40]"
         :page-size="listInfo.query.size"
         :current-page.sync="listInfo.query.current"
         @current-change="handleCurrentChange"
diff --git a/src/components/index.vue b/src/components/index.vue
index e9b9720..031723d 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -118,6 +118,11 @@
                 v-has="'m11-3'"
                 >设备管理</el-menu-item
               >
+              <el-menu-item
+                index="/ConfigManager/factor"
+                v-has="'m11-4'"
+                >因子管理</el-menu-item
+              >
             </el-submenu>
             <el-submenu index="5" v-has="'m4'">
               <template slot="title">
diff --git a/src/components/sys/user.vue b/src/components/sys/user.vue
index 248031e..a3141c4 100644
--- a/src/components/sys/user.vue
+++ b/src/components/sys/user.vue
@@ -3,7 +3,7 @@
     <div id="UserTop">
       <el-input placeholder="请输入用户名称" v-model="UserValue" clearable></el-input>
       <el-button type="primary" icon="el-icon-search" @click="loadGridData()" v-has="'Search'">搜索</el-button>
-      <el-button type="primary" icon="el-icon-plus" @click="handleClick('AddUser')" v-has="'Search'">新增用户</el-button>
+      <el-button type="primary" icon="el-icon-plus" @click="handleClick('AddUser')" v-has="'m9-1-1'">新增用户</el-button>
     </div>
     <div
       id="UserCentent"
@@ -97,8 +97,8 @@
       //弹窗相关
       dialogInfo:{
         title: {
-          update: '修改',
-          AddUser: '新增'
+          update: '修改用户',
+          AddUser: '添加用户'
         },
         visible: false,
         btLoading: false,
@@ -117,7 +117,7 @@
           login: '',
           pwd: '',
           realName: '', //用户名称
-          userType: undefined, //类型
+          userType: 0, //类型
           mobile: '', //电话
           orgId: undefined, //组织
           roleId: undefined, //角色
@@ -127,7 +127,7 @@
           {label:'登录密码',value:'pwd',type:'password'},
           {label:'用户名称',value:'realName',type:'input',required:true},
           {label:'电话',value:'mobile',type:'input',validator:checkPhone},
-          {label:'用户类型',value:'userType',type:'select',list:'userType',required:true},
+          {label:'用户类型',value:'userType',type:'select',list:'userType',required:true,disabled:true},
           {label:'所属组织',value:'orgId',type:'treeselect',list:'deptTree',required:true},
           {label:'所属角色',value:'roleId',type:'select',list:'roleList',required:true}
         ],
@@ -198,6 +198,15 @@
         case 'AddUser':
           dialogInfo.type = event;
           dialogInfo.visible = true;
+          this.formInfo.fieldList.forEach(item =>{
+            if(item.value === "pwd") {
+              item.required = true;
+            }
+          })
+          this.initRules();
+          setTimeout(() => {
+            this.formInfo.ref.clearValidate();
+          }, 0);
           break
         //编辑用户
         case 'update':
@@ -207,6 +216,12 @@
               formInfo.data[key] = data[key];
             }
           }
+          this.formInfo.fieldList.forEach(item =>{
+            if(item.value === "pwd") {
+              item.required = false;
+            }
+          })
+          this.initRules();
           dialogInfo.visible = true;
           break
         //删除用户
@@ -315,7 +330,7 @@
         login: '',
         pwd: '',
         realName: '', //用户名称
-        userType: undefined, //类型
+        userType: 0, //类型
         mobile: '', //电话
         orgId: undefined, //组织
         roleId: undefined, //角色
diff --git a/src/router/index.js b/src/router/index.js
index 56393e2..8e760a1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -82,6 +82,11 @@
           component: (resolve) => require(["@/components/ConfigManager/device"],resolve)
         },
         {
+          path: "/ConfigManager/factor", // 配置管理--因子管理
+          name: "FactorConfigManager",
+          component: (resolve) => require(["@/components/ConfigManager/factor"],resolve)
+        },
+        {
           path: "/MessageManagement/MessageQuery", // 消息管理--消息查询
           name: "MessageQuery",
           component: (resolve) => require(["@/components/MessageManagement/MessageQuery"],resolve)

diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index b4e4a8f..440a79e 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -78,6 +78,15 @@
   background: transparent;
 }
 /****页面通用样式****/
+.flex{
+  display: flex;
+}
+.flex-1{
+  flex: 1;
+}
+.flex-d{
+  flex-direction: column;
+}
 .page-data {
   display: flex;
   flex-direction: column;
@@ -108,10 +117,10 @@
   flex-direction: column;
   flex: 1;
   padding: 20px;
+  padding-bottom: 0 !important;
   overflow-y: auto;
 }
 .page-data-dialog .el-pagination__sizes,
-.page-data-dialog .el-pagination__total,
 .page-data-dialog .el-pagination__jump{
-  display: none;
+  display: none !important;
 }
\ No newline at end of file
diff --git a/src/assets/css/mixin.css b/src/assets/css/mixin.css
deleted file mode 100644
index 9e97d02..0000000
--- a/src/assets/css/mixin.css
+++ /dev/null
@@ -1 +0,0 @@
-/* No CSS *//*# sourceMappingURL=mixin.css.map */
\ No newline at end of file
diff --git a/src/assets/css/mixin.css.map b/src/assets/css/mixin.css.map
deleted file mode 100644
index 356f200..0000000
--- a/src/assets/css/mixin.css.map
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "version": 3,
-    "mappings": "",
-    "sources": [
-        "mixin.scss"
-    ],
-    "names": [],
-    "file": "mixin.css"
-}
\ No newline at end of file
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 219a678..281044c 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -1,107 +1,37 @@
 <template>
-  <div id="pagetwo">
-    <div class="form">
-      <el-input
-        v-model="searchStr"
-        placeholder="请输入站点编号或站点名称"
-        clearable
-        @change="handleChangeSearch"
-      ></el-input>
-      <el-date-picker
-        v-model="startDate"
-        value-format="yyyy-MM-dd"
-        :picker-options="pickerOptionsStart"
-        type="date"
-        :clearable="true"
-        placeholder="请选择开始日期"
+  <div id="pagetwo" class="page-data">
+    <!--搜素框-->
+    <div class="page-filter">
+      <page-filter
+        :query.sync="siteFilterInfo.query"
+        :filter-list="siteFilterInfo.list"
+        @handleClick="handleClick"
       />
-      <el-date-picker
-        v-model="endDate"
-        value-format="yyyy-MM-dd"
-        :picker-options="pickerOptionsEnd"
-        type="date"
-        :clearable="true"
-        placeholder="请选择结束日期"
-      />
-      <el-button
-        type="primary"
-        icon="el-icon-search"
-        @click="search"
-        v-has="'Search'"
-        >查询</el-button
-      >
-      <el-button
-        type="primary"
-        icon="el-icon-circle-plus-outline"
-        @click="addform('ruleForm')"
-        v-has="'m11-2-1'"
-        >添加站点</el-button
-      >
     </div>
-
-    <el-table :data="listExtend" style="width: 100%; height: calc(100% - 82px)">
-      <el-table-column
-        type="index"
-        label="序号"
-        width="70"
-      ></el-table-column>
-      <el-table-column
-        prop="stCode"
-        label="站点编号"
-        max-width="120"
-        show-overflow-tooltip
-      ></el-table-column>
-      <el-table-column
-        prop="stName"
-        label="站点名称"
-        show-overflow-tooltip
-        max-width="150"
-      ></el-table-column>
-      <el-table-column label="站点类型" width="120">
-        <template slot-scope="scope">
-          <div>
-            <span v-if="scope.row.stationType == 0">水质站</span>
-            <span v-if="scope.row.stationType == 1">水位站</span>
-            <span v-if="scope.row.stationType == 2">流量站</span>
-          </div>
-        </template></el-table-column
-      >
-      <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"
-            size="small"
-            @click="EditFZ(scope.$index, scope.row)"
-            style="margin: 0 10px"
-            v-has="'m11-2-2'"
-            >修改</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
+    <div class="page-content">
+      <!--表格-->
+      <div class="h-100">
+        <page-table
+          tabIndex
+          pagination
+          :api-url="siteTableInfo.url"
+          :refresh="siteTableInfo.refresh"
+          :data.sync="siteTableInfo.data"
+          :query="siteFilterInfo.query"
+          :page-query="siteTableInfo.pageQuery"
+          :list-type-info="listTypeInfo"
+          :init-curpage="siteTableInfo.initCurpage"
+          :field-list="siteTableInfo.fieldList"
+          :handle="siteTableInfo.handle"
+          @handleClick="handleClick"
+        >
+          <!-- 自定义插槽显示状态 -->
+          <template v-slot:col-equips="scope">
+            <el-button type="text" size="small" @click="handleClick('look',scope.row)">查看设备</el-button>
+          </template>
+        </page-table>
+      </div>
+    </div>
 
     <!-- 新增/修改的弹出框 -->
     <el-dialog
@@ -266,72 +196,138 @@
       class="page-data-dialog"
       :title="dialogInfo.title[dialogInfo.type]"
       :visible.sync="dialogInfo.visible"
-      :width="dialogInfo.width"
+      width="80%"
       :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"
-      />
+      <template v-if="dialogInfo.type === 'look'">
+        <div class="page-filter">
+          <el-form :inline="true" :model="deviceRelatedQuery" ref="deviceRelatedQuery" size="medium">
+            <el-form-item label="">
+              <el-input v-model="deviceRelatedQuery.searchStr" placeholder="请输入设备编号/厂家" clearable></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="medium" @click="handleClick('deviceSearch')">查询</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="page-content">
+          <el-row :gutter="20" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">未关联设备列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="unRelated"
+                :api-url="deviceTableInfo.url"
+                :refresh="deviceTableInfo.refresh"
+                :data.sync="unRelatedDeviceTableInfo.data"
+                :query="unRelatedDeviceTableInfo.query"
+                :init-curpage="deviceTableInfo.initCurpage"
+                :field-list="deviceTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+            <el-col :span="4" class="h-100">
+              <div class="btn-group">
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-right"
+                  :disabled="isCanInsertDevice"
+                  @click="handleClick('insert')"
+                  >添加</el-button
+                >
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-left"
+                  :disabled="isCanRemoveDevice"
+                  @click="handleClick('remove')"
+                  >移除</el-button
+                >
+              </div>
+            </el-col>
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">已关联设备列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="isRelated"
+                :api-url="deviceTableInfo.url"
+                :refresh="deviceTableInfo.refresh"
+                :data.sync="isRelatedDeviceTableInfo.data"
+                :query="isRelatedDeviceTableInfo.query"
+                :init-curpage="deviceTableInfo.initCurpage"
+                :field-list="deviceTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+          </el-row>
+        </div>
+      </template>
     </page-dialog>
-    <el-pagination
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page="currentPage"
-      :page-sizes="[10, 20, 30, 40]"
-      :page-size="PageSize"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="AllTotal"
-    >
-    </el-pagination>
   </div>
 </template>
 <script>
 import axios from "axios";
-
+import { mapGetters } from "vuex";
 export default {
-  name: "StatisticalReport",
   data() {
     return {
+      //站点搜索相关
+      siteFilterInfo: {
+        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: "el-icon-search", event: "search", show: true},
+          {type: "button", label: "添加站点", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-2-1"}
+        ]
+      },
+      //站点表格相关
+      siteTableInfo: {
+        url: this.nozzle.listExtend, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [],
+        fieldList: [
+          { label: "站点编号", value: "stCode", minWidth: 120, tooltip: true },
+          { label: "站点名称", value: "stName", minWidth: 120, tooltip: true },
+          { label: "站点类型", value: "stationTypeName", width: 120 },
+          { label: "站点安装时间", value: "createTime", minWidth: 120, tooltip: true },
+          { label: "安装人", value: "person", width: 120 },
+          { label: "关联设备", value: "equips", width: 100, type: "slot" },
+          { label: "首次数据接入时间", value: "tt", minWidth: 120, tooltip: true },
+        ],
+        handle: {
+          fixed: "right",
+          label: "操作",
+          width: "80",
+          btList: [
+            { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-2-2' }
+          ]
+        }
+      },
+      //列表相关
+      listTypeInfo: {},
       loadingdelet: undefined,
       loading: false,
       timer: null,
       dialogImageUrl: "",
       dialogVisible: false,
-      PageSize: 10,
-      AllTotal: 0,
-      currentPage: 1,
       title: "站点管理",
-      listExtend: [], // 站点管理的返回数据
       siteTypeList: [], //弹框里面站点类型列表
-      searchStr: "",
-      file: [],
-      startDate: "",
-      endDate: "",
-      pickerOptionsStart: {
-        //结束时间不能大于开始时间
-        disabledDate: time => {
-          if (this.endDate) {
-            return time.getTime() > new Date(this.endDate).getTime();
-          }
-        }
-      },
-      pickerOptionsEnd: {
-        disabledDate: time => {
-          return time.getTime() < new Date(this.startDate).getTime();
-        }
-      },
-      List: [],
-      ledlist: [],
       yzaddflag: false,
       ruleForm: {
         id: "", //站点ID
@@ -431,7 +427,7 @@
       //弹窗相关
       dialogInfo:{
         title: {
-          look: '关联设备列表'
+          look: ''
         },
         width: '60%',
         visible: false,
@@ -441,65 +437,65 @@
           {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: '', //接口地址
+        url: this.nozzle.sysEquipRelatedList, //接口地址
         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: "",
+      //已关联设备表格相关
+      isRelatedDeviceTableInfo: {
+        data: [],
+        query: {
+          sign: ""
+        },
+        selectList: []
+      },
+      //未关联设备表格相关
+      unRelatedDeviceTableInfo: {
+        data: [],
+        query: {
+          sign: "unbound"
+        },
+        selectList: []
+      },
+      //设备关联过滤相关
+      deviceRelatedQuery: {
+        searchStr: "",
+        siteCode: ""
+      }
     };
   },
   mounted() {
-    this.getsyscityList();
-    this.getlistExtend();
+    this.siteTableInfo.refresh = Math.random();
     this.getsityType();
     this.getCurrentUserProject(); //获取当前用户所绑定的项目
   },
+  computed: {
+    //移除按钮是否可点击
+    isCanRemoveDevice() {
+      return this.isRelatedDeviceTableInfo.selectList.length ? false : true;
+    },
+    //添加按钮是否可点击
+    isCanInsertDevice() {
+      return this.unRelatedDeviceTableInfo.selectList.length ? false : true;
+    },
+    ...mapGetters(["allDept", "allRole", "allCity"])
+  },
   watch: {
     "ruleForm.area": {
       handler(newVal, oldVal) {
         if (this.$refs.cascader) {
           let children = this.$refs.cascader.getCheckedNodes();
-          // console.log(children);
           if (
             children.length &&
             children[0].children &&
             children[0].children.length < 1
           ) {
-            // console.log(9999);
             this.$refs.cascader.dropDownVisible = false;
           }
         }
@@ -516,30 +512,18 @@
     "dialogInfo.visible"(val) {
       if(!val) {
         this.deviceTableInfo.data = [];
+        this.deviceRelatedQuery.searchStr = "";
         this.dialogInfo.btLoading = false;
       }
+    },
+    "deviceRelatedQuery.searchStr"(val) {
+      Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+      Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
     }
   },
   methods: {
-    //将空的children置为undefined,避免在没有下一级数据的情况下显示暂无数据
-    removeEmptyChild(arr) {
-      arr.forEach(item => {
-        if (!item.children || item.children.length < 1) {
-          item.children = undefined;
-        } else {
-          this.removeEmptyChild(item.children);
-        }
-      });
-      return arr;
-    },
-    handleChangeSearch() {
-      this.currentPage = 1;
-      this.getlistExtend();
-    },
     //上传头像
     fileChange(file) {
-      // console.log(file.size, file.raw.type);
-      // const isJPG = file.raw.type === "image/jpeg";
       this.loading = true;
       const isLt1M = file.size / 1024 / 1024 < 1;
       if (file.raw.type != "image/jpeg" && file.raw.type != "image/png") {
@@ -559,25 +543,24 @@
       let config = {
         headers: { "Content-Type": "multipart/form-data" }
       };
-      axios
-        .post(this.nozzle.upload, formdata, config)
-        .then(res => {
-          if (res.data.code == 1) {
-            this.loading = false;
-            this.$message({
-              message: "上传图片成功！",
-              type: "success"
-            });
-            this.ruleForm.fileList.push(res.data.data[0]);
-          }
-        })
-        .catch(res => {
+      axios.post(this.nozzle.upload, formdata, config).then(res => {
+        if (res.data.code == 1) {
           this.loading = false;
           this.$message({
-            message: "服务器问题！请重试！",
-            type: "warning"
+            message: "上传图片成功！",
+            type: "success"
           });
+          this.ruleForm.fileList.push(res.data.data[0]);
+          this.siteTableInfo.refresh = Math.random();
+        }
+      })
+      .catch(res => {
+        this.loading = false;
+        this.$message({
+          message: "服务器问题！请重试！",
+          type: "warning"
         });
+      });
     },
     // 删除图片按钮
     deleteImg(fileNo) {
@@ -633,39 +616,24 @@
       this.dialogImageUrl = file.fileCloudStorageKey;
       this.dialogVisible = true;
     },
-    // 获取站点列表
-    async getlistExtend() {
-      const { data } = await this.$http.post(this.nozzle.listExtend, {
-        current: this.currentPage,
-        data: {
-          searchStr: this.searchStr,
-          startDate: this.startDate,
-          endDate: this.endDate
-        },
-        size: this.PageSize
-      });
-      this.listExtend = data.data.list;
-      this.AllTotal = data.data.total;
-    },
-    // 搜索查询按钮
-    search() {
-      this.currentPage = 1;
-      this.getlistExtend();
-    },
-    deleteRow(index, rows) {
-      rows.splice(index, 1);
-    },
     // 弹框提交表单按钮
     saveOru(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
-          this.$http
-            .post(this.nozzle.saveOrupdate, {
-              data: this.ruleForm
-            })
-            .then(res => {
+          this.$http.post(this.nozzle.saveOrupdate, {
+            data: this.ruleForm
+          })
+          .then(res => {
+            if(res.data.code === 1) {
+              this.siteTableInfo.refresh = Math.random();
               this.yzaddflag = false;
-            });
+            }
+            this.$message({
+              message: res.data.msg,
+              type: res.data.code === 1 ? 'success' : 'error',
+              showClose: true,
+            })
+          });
         }
       });
     },
@@ -674,7 +642,6 @@
       this.yzaddflag = false;
       this.$refs[formName].resetFields();
     },
-
     visiblechange(visible) {
       if (visible) {
         this.timer = setInterval(() => {
@@ -690,34 +657,6 @@
         clearInterval(this.timer);
       }
     },
-    // 添加站点
-    addform(formName) {
-      this.yzaddflag = true;
-      // 获取地区列表
-      this.title = "新增站点";
-    },
-    // 操作里面的修改弹窗
-    EditFZ(index, rows) {
-      // 获取地区列表
-      for (let key in rows) {
-        if (key === "stationType") {
-          rows[key] = rows[key].toString();
-        }
-        this.ruleForm[key] = rows[key];
-      }
-      this.yzaddflag = true;
-      this.title = "修改站点";
-      this.FenZuflag2type = 2;
-      this.AddFZInput = rows.groupName;
-      this.ClickID = rows.id;
-    },
-    // 获取地区列表数据
-    async getsyscityList() {
-      const { data } = await this.$http.post(this.nozzle.syscity);
-
-      let arr = this.removeEmptyChild(data.data);
-      this.syscityList = data.data;
-    },
     //获取站点类型列表
     async getsityType() {
       const { data } = await this.$http.post(this.nozzle.sityType, {
@@ -745,43 +684,98 @@
         }
       })
     },
+    //表格checkbox选择事件
+    handleEvent(event, data) {
+      switch (event) {
+        case "isRelated":
+          this.isRelatedDeviceTableInfo.selectList = data;
+          break;
+        case "unRelated":
+          this.unRelatedDeviceTableInfo.selectList = data;
+          break;
+      }
+    },
     //点击事件
     handleClick(event, data, index){
       switch(event) {
+        //站点搜索
+        case "search":
+          this.siteTableInfo.initCurpage = Math.random();
+          this.siteTableInfo.refresh = Math.random();
+          break;
+        //添加站点
+        case "create":
+          this.yzaddflag = true;
+          this.title = "新增站点";
+          this.syscityList = this.removeEmptyChild(this.allCity);
+          break;
+        //编辑站点
+        case "update":
+          this.title = "修改站点";
+          for (let key in data) {
+            if (key === "stationType") {
+              data[key] = data[key].toString();
+            }
+            this.ruleForm[key] = data[key];
+          }
+          this.syscityList = this.removeEmptyChild(this.allCity);
+          this.yzaddflag = true;
+          break;
         //查看关联设备
         case "look":
-          this.dialogInfo.visible = true;
           this.dialogInfo.type = event;
-          this.deviceTableInfo.data = data.equips;
-          this.needHandleSiteCode = data.stCode;
+          this.deviceRelatedQuery.siteCode = data.stCode;
+          this.dialogInfo.visible = true;
+          setTimeout(() => {
+            Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+            Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+            this.deviceTableInfo.refresh = Math.random();
+          }, 0);
+          break;
+        //关联设备搜索
+        case "deviceSearch":
+          this.deviceTableInfo.initCurpage = Math.random();
+          this.deviceTableInfo.refresh = Math.random();
+          break;
+        //添加设备到站点
+        case "insert":
+          const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map( item => item.equipNo);
+          const insertData = {
+            siteCode: this.unRelatedDeviceTableInfo.query.siteCode,
+            equipNos: insertEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipInsertBatch, { data: insertData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              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
+            });
+          });
           break;
         //解绑设备与站点
         case "remove":
-          this.$confirm("此操作将解除设备和站点的绑定关系, 是否继续?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(res =>{
-            const params = {
-              data: {
-                siteCode: this.needHandleSiteCode,
-                equipNos: [data.equipNo]
-              }
+          const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(item => item.equipNo);
+          const removeData = {
+            siteCode: this.isRelatedDeviceTableInfo.query.siteCode,
+            equipNos: removeEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipRemoveBatch, { data: removeData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              this.deviceTableInfo.refresh = Math.random();
+              this.deviceTableInfo.initCurpage = Math.random();
             }
-            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(() =>{})
+            this.$message({
+              message: res.data.msg,
+              type: res.data.code === 1 ? "success" : "error",
+              showClose: true
+            });
+          }).catch(e =>{console.log(e)});
           break;
         //关闭
         case "close":
@@ -820,19 +814,21 @@
       };
       this.$refs.cascader.$refs.panel.activePath = [];
       this.$refs.cascader.$refs.panel.clearCheckedNodes();
-      // this.getlistExtend();
     },
     handleChange(value) {
       // 取选中数组的最后一项的id
       this.ruleForm.area = value.slice(-1)[0];
     },
-    handleSizeChange(val) {
-      this.PageSize = val;
-      this.getlistExtend();
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getlistExtend();
+    //将空的children置为undefined,避免在没有下一级数据的情况下显示暂无数据
+    removeEmptyChild(arr) {
+      arr.forEach(item => {
+        if (!item.children || item.children.length < 1) {
+          item.children = undefined;
+        } else {
+          this.removeEmptyChild(item.children);
+        }
+      });
+      return arr;
     }
   },
   destroyed() {
@@ -841,15 +837,10 @@
 };
 </script>
 <style lang="scss" scoped>
-/deep/ .el-pagination .el-pager li.active {
-  background-color: #409eff !important;
-  cursor: default;
-}
 .imgtype {
   width: 150px;
   height: 100px;
 }
-
 /deep/ .el-upload-list {
   display: none;
 }
@@ -858,7 +849,6 @@
   margin: 0 20px 20px 0;
   position: relative;
 }
-
 .deleteSpan {
   position: absolute;
   display: inline-block;
@@ -893,26 +883,33 @@
   width: 200px;
   margin: 0 10px;
 }
-
-.title {
-  height: 50px;
-  line-height: 50px;
+.title, .table-title{
+  @include hl(30px,30px);
+  color: #409EFF;
   text-align: center;
   font-size: 16px;
+  margin-bottom: 10px;
 }
-
 .tableSection {
   padding: 10px;
   background: rgba(270, 255, 255, 0.05);
 }
 /deep/ .el-dialog .el-dialog__body {
   text-align: left;
+  padding-bottom: 0;
 }
-
 .el-dialog .selectInput {
   width: 30% !important;
 }
 .el-dialog .selectInput .el-select-dropdown__empty {
   width: 100% !important;
 }
+.btn-group {
+  height: 100%;
+  @include fdaj(center, center);
+  /deep/ .el-button + .el-button {
+    margin-left: 0;
+    margin-top: 10px;
+  }
+}
 </style>
diff --git a/src/components/ConfigManager/device.vue b/src/components/ConfigManager/device.vue
index f800811..bc4ccda 100644
--- a/src/components/ConfigManager/device.vue
+++ b/src/components/ConfigManager/device.vue
@@ -35,22 +35,97 @@
     </div>
     <!--弹窗-->
     <page-dialog
+      class="page-data-dialog"
       :title="dialogInfo.title[dialogInfo.type]"
       :visible.sync="dialogInfo.visible"
-      :width="dialogInfo.width"
+      :width="dialogInfo.type === 'relate' ? '80%' : '500px'"
       :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"
-      />
+      <!--关联因子-->
+      <template v-if="dialogInfo.type === 'relate'">
+        <div class="page-filter">
+          <el-form :inline="true" :model="factorQuery" ref="factorQuery" size="medium">
+            <el-form-item label="">
+              <el-input v-model="factorQuery.searchStr" placeholder="因子名称/ASCII码" clearable></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="medium" @click="handleClick('factorSearch')">查询</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="page-content">
+          <el-row :gutter="20" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">未关联因子列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="unRelated"
+                :api-url="factorTableInfo.url"
+                :refresh="factorTableInfo.refresh"
+                :data.sync="unRelatedFactorTableInfo.data"
+                :query="unRelatedFactorTableInfo.query"
+                :init-curpage="factorTableInfo.initCurpage"
+                :field-list="factorTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+            <el-col :span="4" class="h-100">
+              <div class="btn-group">
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-right"
+                  :disabled="isCanInsertFactor"
+                  @click="handleClick('insert')"
+                  >添加</el-button
+                >
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-d-arrow-left"
+                  :disabled="isCanRemoveFactor"
+                  @click="handleClick('remove')"
+                  >移除</el-button
+                >
+              </div>
+            </el-col>
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">已关联因子列表</div>
+              <page-table
+                class="flex-1"
+                checkBox
+                pagination
+                type="isRelated"
+                :api-url="factorTableInfo.url"
+                :refresh="factorTableInfo.refresh"
+                :data.sync="isRelatedFactorTableInfo.data"
+                :query="isRelatedFactorTableInfo.query"
+                :init-curpage="factorTableInfo.initCurpage"
+                :field-list="factorTableInfo.fieldList"
+                @handleClick="handleClick"
+                @handleEvent="handleEvent"
+              />
+            </el-col>
+          </el-row>
+        </div>
+      </template>
+      <!--新增/修改表单-->
+      <template v-else>
+        <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"
+        />
+      </template>
     </page-dialog>
   </div>
 </template>
@@ -80,8 +155,8 @@
           {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"}
+          {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "search", show: true},
+          {type: "button", label: "添加设备", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-3-1"}
         ]
       },
       //设备表格相关
@@ -89,9 +164,7 @@
         url: this.nozzle.sysEquipList, //接口地址
         refresh: 1,
         initCurpage: 1,
-        data: [
-          {equipNo:1000,equipDesc:"3333",equipFactory:'4444'}
-        ],
+        data: [],
         fieldList: [
           { label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
           { label: "设备描述", value: "equipDesc", minWidth: 150, tooltip: true },
@@ -105,8 +178,9 @@
         handle: {
           fixed: "right",
           label: "操作",
-          width: "120",
+          width: "180",
           btList: [
+            { label: "关联因子", size: "small", type: "text", event: "relate", show: true, has: 'm11-3-4' },
             { 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' }
           ]
@@ -143,18 +217,60 @@
       //弹窗相关
       dialogInfo:{
         title: {
-          update: '编辑设备',
-          create: '添加设备'
+          update: "编辑设备",
+          create: "添加设备",
+          relate: "",
         },
-        width: '500px',
+        width: "500px",
         visible: false,
         btLoading: false,
-        type: '',
+        type: "",
         btList: [
-          {label:'关闭',type:'',icon:'',event:'close',show:true},
-          {label:'保存',type:'primary',icon:'',event:'save',show:true,loading:true}
+          {label:"关闭",type:"",icon:"",event:"close",show:true},
+          {label:"保存",type:"primary",icon:"",event:"save",show:true,loading:true}
         ]
       },
+      //因子表格通用相关
+      factorTableInfo: {
+        url: this.nozzle.sysEquipFactorList, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        fieldList: [
+          { label: "因子名称", value: "codeProperty", minWidth: 100, tooltip: true },
+          { label: "因子ASCII码", value: "codeAscll", minWidth: 100, tooltip: true },
+        ]
+      },
+      //已关联因子表格相关
+      isRelatedFactorTableInfo: {
+        data: [],
+        query: {
+          sign: ""
+        },
+        selectList: []
+      },
+      //未关联因子表格相关
+      unRelatedFactorTableInfo: {
+        data: [],
+        query: {
+          sign: "unbound"
+        },
+        selectList: []
+      },
+      //设备关联过滤相关
+      factorQuery: {
+        searchStr: "",
+        equipNo: ""
+      }
+    }
+  },
+  computed: {
+    //移除按钮是否可点击
+    isCanRemoveFactor() {
+      return this.isRelatedFactorTableInfo.selectList.length ? false : true;
+    },
+    //添加按钮是否可点击
+    isCanInsertFactor() {
+      return this.unRelatedFactorTableInfo.selectList.length ? false : true;
     }
   },
   watch: {
@@ -165,8 +281,20 @@
         }
         this.resetForm();
         this.btnLoading = false;
+        this.factorQuery.searchStr = "";
       }
     },
+    "dialogInfo.type"(val) {
+      this.dialogInfo.btList.forEach(item =>{
+        if(item.event === "save") {
+          item.show = val === "relate" ? false : true;
+        }
+      })
+    },
+    "factorQuery.searchStr"(val) {
+      Object.assign(this.isRelatedFactorTableInfo.query, this.factorQuery);
+      Object.assign(this.unRelatedFactorTableInfo.query, this.factorQuery);
+    }
   },
   created() {
     this.initSiteData();
@@ -198,6 +326,17 @@
         }
       })
     },
+    //表格checkbox选择事件
+    handleEvent(event, data) {
+      switch (event) {
+        case "isRelated":
+          this.isRelatedFactorTableInfo.selectList = data;
+          break;
+        case "unRelated":
+          this.unRelatedFactorTableInfo.selectList = data;
+          break;
+      }
+    },
     //点击事件
     handleClick(event, data) {
       switch (event) {
@@ -243,6 +382,62 @@
             })
           }).catch(() =>{})
           break;
+        //查看关联因子
+        case "relate":
+          this.dialogInfo.type = event;
+          this.factorQuery.equipNo = data.equipNo;
+          this.dialogInfo.visible = true;
+          setTimeout(() => {
+            Object.assign(this.isRelatedFactorTableInfo.query, this.factorQuery);
+            Object.assign(this.unRelatedFactorTableInfo.query, this.factorQuery);
+            this.factorTableInfo.refresh = Math.random();
+          }, 0);
+          break;
+        //关联因子搜索
+        case "factorSearch":
+          this.factorTableInfo.initCurpage = Math.random();
+          this.factorTableInfo.refresh = Math.random();
+          break;
+        //添加因子到站点
+        case "insert":
+          const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map( item => item.equipNo);
+          const insertData = {
+            siteCode: this.unRelatedDeviceTableInfo.query.siteCode,
+            equipNos: insertEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipInsertBatch, { data: insertData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              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
+            });
+          });
+          break;
+        //解绑因子与站点
+        case "remove":
+          const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(item => item.equipNo);
+          const removeData = {
+            siteCode: this.isRelatedDeviceTableInfo.query.siteCode,
+            equipNos: removeEquipNoArr
+          };
+          this.$http.post(this.nozzle.sysEquipRemoveBatch, { data: removeData }).then(res => {
+            if (res.data.code === 1) {
+              this.deviceRelatedQuery.searchStr = "";
+              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 =>{console.log(e)});
+          break;
         //关闭
         case "close":
           setTimeout(() => {
@@ -294,4 +489,22 @@
     },
   }
 }
-</script>
\ No newline at end of file
+</script>
+
+<style lang="scss" scoped>
+.table-title{
+  @include hl(30px,30px);
+  color: #409EFF;
+  text-align: center;
+  font-size: 16px;
+  margin-bottom: 10px;
+}
+.btn-group {
+  height: 100%;
+  @include fdaj(center, center);
+  /deep/ .el-button + .el-button {
+    margin-left: 0;
+    margin-top: 10px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/ConfigManager/factor.vue b/src/components/ConfigManager/factor.vue
new file mode 100644
index 0000000..f38f0b9
--- /dev/null
+++ b/src/components/ConfigManager/factor.vue
@@ -0,0 +1,79 @@
+<template>
+  <div class="page-data">
+    <!--搜素框-->
+    <div class="page-filter">
+      <page-filter
+        :query.sync="factorFilterInfo.query"
+        :filter-list="factorFilterInfo.list"
+        @handleClick="handleClick"
+      />
+    </div>
+    <div class="page-content">
+      <!--表格-->
+      <div class="h-100">
+        <page-table
+          tabIndex
+          pagination
+          :api-url="factorTableInfo.url"
+          :refresh="factorTableInfo.refresh"
+          :data.sync="factorTableInfo.data"
+          :query="factorFilterInfo.query"
+          :page-query="factorTableInfo.pageQuery"
+          :init-curpage="factorTableInfo.initCurpage"
+          :field-list="factorTableInfo.fieldList"
+          @handleClick="handleClick"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { message } from "./../../util/item";
+export default {
+  data() {
+    return {
+      //因子搜索相关
+      factorFilterInfo: {
+        query: {
+          searchStr: "",
+        },
+        list: [
+          {type: "input", label: "因子名称/ASCII码", value: "searchStr", hideLabel: true },
+          {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "search", show: true},
+        ]
+      },
+      //因子表格相关
+      factorTableInfo: {
+        url: this.nozzle.sysEquipConfigList, //接口地址
+        refresh: 1,
+        initCurpage: 1,
+        data: [],
+        fieldList: [
+          { label: "因子名称", value: "codeProperty", minWidth: 150, tooltip: true },
+          { label: "因子ASCII码", value: "codeAscll", minWidth: 100, tooltip: true },
+          { label: "水文编号", value: "code", minWidth: 100, tooltip: true },
+          { label: "因子最大值", value: "maxValue", minWidth: 100, tooltip: true },
+          { label: "因子最小值", value: "minValue", minWidth: 100, tooltip: true },
+          { label: "因子单位", value: "unit", minWidth: 100, tooltip: true },
+        ]
+      }
+    }
+  },
+  mounted() {
+    this.factorTableInfo.refresh = Math.random();
+  },
+  methods: {
+    //点击事件
+    handleClick(event, data) {
+      switch (event) {
+        //设备搜索
+        case "search":
+          this.factorTableInfo.initCurpage = Math.random();
+          this.factorTableInfo.refresh = Math.random();
+          break;
+      }
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index 065f3da..31253a6 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -35,6 +35,7 @@
     </div>
     <!--弹窗-->
     <el-dialog
+      class="page-data-dialog"
       :width="dialogInfo.width"
       append-to-body
       :title="dialogInfo.title[dialogInfo.type]"
@@ -55,9 +56,10 @@
         </div>
         <div class="page-content">
           <el-row :gutter="20" class="h-100">
-            <el-col :span="10" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">未关联站点列表</div>
               <page-table
-                tabIndex
+                class="flex-1"
                 checkBox
                 pagination
                 type="unRelate"
@@ -91,9 +93,10 @@
                 >
               </div>
             </el-col>
-            <el-col :span="10" class="h-100">
+            <el-col :span="10" class="h-100 flex flex-d">
+              <div class="table-title">已关联站点列表</div>
               <page-table
-                tabIndex
+                class="flex-1"
                 checkBox
                 pagination
                 type="isRelate"
@@ -244,8 +247,8 @@
           {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: "searchProject", show: true},
-          {type: "button", label: "添加项目", btType: "primary", icon: "", event: "create", show: true, has: "m11-1-4"}
+          {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "searchProject", show: true},
+          {type: "button", label: "添加项目", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-1-4"}
         ]
       },
       //项目表格相关
@@ -269,7 +272,7 @@
           width: "240",
           btList: [
             { label: "分配权限", size: "small", type: "text", event: "permission", show: true, has: 'm11-1-1' },
-            { label: "项目关联站点", size: "small", type: "text", event: "relate", show: true, has: 'm11-1-2' },
+            { label: "关联站点", size: "small", type: "text", event: "relate", show: true, has: 'm11-1-2' },
             { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-1-3' },
             { label: "删除", size: "small", type: "text", event: "delete", show: true, has: 'm11-1-5' }
           ]
@@ -329,10 +332,9 @@
         xmlxList: [{ key: "合同项目", value: "0" }, { key: "临测项目", value: "1" }],
         groupList: [],
         deptTree: [],
-        roleTree: [],
         userType: [{ key: "普通用户", value: 0 }, { key: "超级管理员", value: 1 }],
         statusList: [{ key: "未管理", value: 0 }, { key: "管理中", value: 1 }],
-        roleList: [{ key: "111", value: 0 }, { key: "2222", value: 1 }],
+        roleList: [],
       },
       //用户弹窗相关
       userDialogInfo: {
@@ -679,7 +681,6 @@
           this.dialogInfo.visible = true;
           this.dialogInfo.type = event;
           this.listTypeInfo.deptTree = this.allDept;
-          this.listTypeInfo.roleTree = this.allRole;
           this.needHandleProjectId = data.platformCode;
           this.permissionFilterInfo.query.platformCode = data.platformCode;
           setTimeout(() => {
@@ -1005,14 +1006,16 @@
   .el-dialog__body {
     @include fd();
     flex: 1;
-    padding: 20px;
+    padding-bottom: 0;
     overflow-y: auto;
   }
-  .el-pagination__sizes,
-  .el-pagination__total,
-  .el-pagination__jump {
-    display: none;
-  }
+}
+.table-title{
+  @include hl(30px,30px);
+  color: #409EFF;
+  text-align: center;
+  font-size: 16px;
+  margin-bottom: 10px;
 }
 .userDialog {
   /deep/ .el-form-item {
diff --git a/src/components/common/PageFilter/index.vue b/src/components/common/PageFilter/index.vue
index a4e93b0..614a410 100644
--- a/src/components/common/PageFilter/index.vue
+++ b/src/components/common/PageFilter/index.vue
@@ -238,4 +238,7 @@
       z-index: 10;
     }
   }
+  /deep/ .el-icon-date:before{
+    color: #fff;
+  }
 </style>
diff --git a/src/components/common/PageForm/index.vue b/src/components/common/PageForm/index.vue
index ddbc8e0..10915fa 100644
--- a/src/components/common/PageForm/index.vue
+++ b/src/components/common/PageForm/index.vue
@@ -243,12 +243,6 @@
         }
       },
       deep: true, // 深度监听
-    },
-    rules: {
-      handler(newVal, oldVal) {
-        console.log(6666,newVal, oldVal);
-      },
-      deep: true,
     }
   },
   mounted () {
@@ -362,6 +356,9 @@
     .el-form-item__label{
       text-align: right !important;
     }
+    .el-icon-date:before{
+      color: #fff;
+    }
   }
   /deep/ .el-form-block{
     width: 100%;
diff --git a/src/components/common/PageTable/index.vue b/src/components/common/PageTable/index.vue
index 0536b03..b992a54 100644
--- a/src/components/common/PageTable/index.vue
+++ b/src/components/common/PageTable/index.vue
@@ -102,7 +102,7 @@
         layout="total, sizes, prev, pager, next, jumper"
         :total="listInfo.total"
         :pager-count="5"
-        :page-sizes="[10, 50, 100, 500, 1000]"
+        :page-sizes="[10, 20, 30, 40]"
         :page-size="listInfo.query.size"
         :current-page.sync="listInfo.query.current"
         @current-change="handleCurrentChange"
diff --git a/src/components/index.vue b/src/components/index.vue
index e9b9720..031723d 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -118,6 +118,11 @@
                 v-has="'m11-3'"
                 >设备管理</el-menu-item
               >
+              <el-menu-item
+                index="/ConfigManager/factor"
+                v-has="'m11-4'"
+                >因子管理</el-menu-item
+              >
             </el-submenu>
             <el-submenu index="5" v-has="'m4'">
               <template slot="title">
diff --git a/src/components/sys/user.vue b/src/components/sys/user.vue
index 248031e..a3141c4 100644
--- a/src/components/sys/user.vue
+++ b/src/components/sys/user.vue
@@ -3,7 +3,7 @@
     <div id="UserTop">
       <el-input placeholder="请输入用户名称" v-model="UserValue" clearable></el-input>
       <el-button type="primary" icon="el-icon-search" @click="loadGridData()" v-has="'Search'">搜索</el-button>
-      <el-button type="primary" icon="el-icon-plus" @click="handleClick('AddUser')" v-has="'Search'">新增用户</el-button>
+      <el-button type="primary" icon="el-icon-plus" @click="handleClick('AddUser')" v-has="'m9-1-1'">新增用户</el-button>
     </div>
     <div
       id="UserCentent"
@@ -97,8 +97,8 @@
       //弹窗相关
       dialogInfo:{
         title: {
-          update: '修改',
-          AddUser: '新增'
+          update: '修改用户',
+          AddUser: '添加用户'
         },
         visible: false,
         btLoading: false,
@@ -117,7 +117,7 @@
           login: '',
           pwd: '',
           realName: '', //用户名称
-          userType: undefined, //类型
+          userType: 0, //类型
           mobile: '', //电话
           orgId: undefined, //组织
           roleId: undefined, //角色
@@ -127,7 +127,7 @@
           {label:'登录密码',value:'pwd',type:'password'},
           {label:'用户名称',value:'realName',type:'input',required:true},
           {label:'电话',value:'mobile',type:'input',validator:checkPhone},
-          {label:'用户类型',value:'userType',type:'select',list:'userType',required:true},
+          {label:'用户类型',value:'userType',type:'select',list:'userType',required:true,disabled:true},
           {label:'所属组织',value:'orgId',type:'treeselect',list:'deptTree',required:true},
           {label:'所属角色',value:'roleId',type:'select',list:'roleList',required:true}
         ],
@@ -198,6 +198,15 @@
         case 'AddUser':
           dialogInfo.type = event;
           dialogInfo.visible = true;
+          this.formInfo.fieldList.forEach(item =>{
+            if(item.value === "pwd") {
+              item.required = true;
+            }
+          })
+          this.initRules();
+          setTimeout(() => {
+            this.formInfo.ref.clearValidate();
+          }, 0);
           break
         //编辑用户
         case 'update':
@@ -207,6 +216,12 @@
               formInfo.data[key] = data[key];
             }
           }
+          this.formInfo.fieldList.forEach(item =>{
+            if(item.value === "pwd") {
+              item.required = false;
+            }
+          })
+          this.initRules();
           dialogInfo.visible = true;
           break
         //删除用户
@@ -315,7 +330,7 @@
         login: '',
         pwd: '',
         realName: '', //用户名称
-        userType: undefined, //类型
+        userType: 0, //类型
         mobile: '', //电话
         orgId: undefined, //组织
         roleId: undefined, //角色
diff --git a/src/router/index.js b/src/router/index.js
index 56393e2..8e760a1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -82,6 +82,11 @@
           component: (resolve) => require(["@/components/ConfigManager/device"],resolve)
         },
         {
+          path: "/ConfigManager/factor", // 配置管理--因子管理
+          name: "FactorConfigManager",
+          component: (resolve) => require(["@/components/ConfigManager/factor"],resolve)
+        },
+        {
           path: "/MessageManagement/MessageQuery", // 消息管理--消息查询
           name: "MessageQuery",
           component: (resolve) => require(["@/components/MessageManagement/MessageQuery"],resolve)
diff --git a/src/util/projectSet.js b/src/util/projectSet.js
index e495528..2564b8a 100644
--- a/src/util/projectSet.js
+++ b/src/util/projectSet.js
@@ -11,7 +11,9 @@
   upload: "/sys/file/upload", //站点管理//上传图片接口
   sityType: "/sys/sysdic/list", //站点管理//站点类型接口
   listExtend: "/sys/stationbase/listExtend", //站点管理//站点列表接口
+  sysEquipRelatedList: "/sys/equipinfo/equiplist", //站点管理----关联设备列表
   sysEquipRemoveBatch: "/sys/equipinfo/removebatch", //站点管理----解绑设备与站点
+  sysEquipInsertBatch: "/sys/equipinfo/addbatch", //站点管理----绑定设备与站点
   syscity: "/sys/syscity/list", //获取地区列表
 
   sysPlatformList: "/sys/sysplatform/list ", //项目配置管理----项目列表
@@ -25,6 +27,9 @@
   sysEquipList: "/sys/equipinfo/list",  //设备管理----设备列表
   sysEquipAddUpdate: "/sys/equipinfo/addOrupdate", //设备管理----新增设备
   sysEquipDelete: "/sys/equipinfo/delete",  //设备管理----删除设备
+  sysEquipFactorList: "/sys/equipconfig/equiplist",  //设备管理----关联因子列表
+
+  sysEquipConfigList: "/sys/equipconfig/list",  //设备管理----因子列表
 };
 
 for (let item in nozzle) {