diff --git a/config/index.js b/config/index.js
index 8e3d0f7..d80aa13 100644
--- a/config/index.js
+++ b/config/index.js
@@ -11,13 +11,13 @@
     assetsPublicPath: '/',
     proxyTable: {
       '/warnApi': {
-          // 测试环境 黄加林
-          'target': 'http://192.168.30.205:8286', // 接口域名
-          // 'target': 'http://192.168.30.30:8001/api', // 服务器接口
-          'changeOrigin': true, //是否跨域
-          'pathRewrite': {
-              '^/warnApi': '' //需要rewrite重写的,
-          }
+        // 测试环境 黄加林
+        'target': 'http://192.168.30.205:8286', // 接口域名
+        // 'target': 'http://192.168.30.30:8001/api', // 服务器接口
+        'changeOrigin': true, //是否跨域
+        'pathRewrite': {
+          '^/warnApi': '' //需要rewrite重写的,
+        }
       },
       '/Api': {
         // 测试环境 陈洪刚
@@ -42,7 +42,7 @@
       '/led': {
         // 测试环境
         // 'target': 'http://192.168.30.189:8800', // 接口域名
-        'target': 'http://192.168.30.15:9200', // 谢阳
+        'target': 'http://192.168.30.15:9209', // 谢阳
         // 'target': 'http://192.168.30.30:8001/api', // 服务器接口
         'changeOrigin': true, //是否跨域
         'pathRewrite': {

diff --git a/config/index.js b/config/index.js
index 8e3d0f7..d80aa13 100644
--- a/config/index.js
+++ b/config/index.js
@@ -11,13 +11,13 @@
     assetsPublicPath: '/',
     proxyTable: {
       '/warnApi': {
-          // 测试环境 黄加林
-          'target': 'http://192.168.30.205:8286', // 接口域名
-          // 'target': 'http://192.168.30.30:8001/api', // 服务器接口
-          'changeOrigin': true, //是否跨域
-          'pathRewrite': {
-              '^/warnApi': '' //需要rewrite重写的,
-          }
+        // 测试环境 黄加林
+        'target': 'http://192.168.30.205:8286', // 接口域名
+        // 'target': 'http://192.168.30.30:8001/api', // 服务器接口
+        'changeOrigin': true, //是否跨域
+        'pathRewrite': {
+          '^/warnApi': '' //需要rewrite重写的,
+        }
       },
       '/Api': {
         // 测试环境 陈洪刚
@@ -42,7 +42,7 @@
       '/led': {
         // 测试环境
         // 'target': 'http://192.168.30.189:8800', // 接口域名
-        'target': 'http://192.168.30.15:9200', // 谢阳
+        'target': 'http://192.168.30.15:9209', // 谢阳
         // 'target': 'http://192.168.30.30:8001/api', // 服务器接口
         'changeOrigin': true, //是否跨域
         'pathRewrite': {
diff --git a/src/components/LED/LEDConfig.vue b/src/components/LED/LEDConfig.vue
index 095e53a..820c265 100644
--- a/src/components/LED/LEDConfig.vue
+++ b/src/components/LED/LEDConfig.vue
@@ -1,46 +1,42 @@
 <template>
   <div id="LEDConfig">
     <div class="formBox">
-      <label for>请输入设备编号：</label>
-      <el-input size="small" v-model="query" placeholder="设备编号"></el-input>
+      <span class="SelectTitle">LED屏分组：</span>
+      <el-select
+        v-model="Project"
+        filterable
+        placeholder="请选择分组"
+        @change="loadProjectUser(Project)"
+      >
+        <el-option
+          v-for="item in ProjectOptions"
+          :key="item.index"
+          :label="item.groupName"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+      <span class="SelectTitle">选择站点：</span>
+      <el-select v-model="Site" filterable placeholder="请选择站点">
+        <el-option
+          v-for="item in SiteOptions"
+          :key="item.index"
+          :label="item.field"
+          :value="item.siteNo"
+        ></el-option>
+      </el-select>
+      <!-- <label for>请输入设备编号：</label>
+      <el-input size="small" v-model="query" placeholder="设备编号"></el-input>-->
       <span id="search" @click="getleddata()">查询</span>
       <span id="search" @click="addform('ruleForm')">新增</span>
+      <span id="search" @click="FenZu()">分组管理</span>
     </div>
     <div class="tableBox">
-      <!-- <table>
-        <tr class="thead">
-          <th>设备编号</th>
-          <th>设备名称</th>
-          <th>站点编号</th>
-          <th>站点名称</th>
-          <th>显示内容</th>
-          <th>预警内容</th>
-          <th>报警内容</th>
-          <th>是否在线</th>
-          <th>操作</th>
-        </tr>
-        <tr class="tbody" v-for="(item,index) in list" :key="index">
-          <td>{{item.idsDev}}</td>
-          <td>{{item.idsName}}</td>
-          <td>{{item.siteNo}}</td>
-          <td>{{item.siteName}}</td>
-          <td>{{item.display}}</td>
-          <td>{{item.earlyDisplay}}</td>
-          <td>{{item.policeDisplay}}</td>
-          <td v-if="item.onlineType == 1">在线</td>
-          <td v-else>离线</td>
-          <td>
-            <span class="tdbtn" @click="sendmsg(item.idsDev)">推送</span>
-            <span class="tdbtn" @click="update(item.idsDev)">修改</span>
-            <span class="tdbtn" @click="deletewarn(item.idsDev)">删除</span>
-          </td>
-        </tr>
-      </table>-->
       <el-table :data="list" style="width: 100%;height:calc(100% - 45px)">
         <el-table-column prop="idsDev" label="设备编号"></el-table-column>
         <el-table-column prop="idsName" label="设备名称"></el-table-column>
         <el-table-column prop="siteNo" label="站点编号"></el-table-column>
         <el-table-column prop="siteName" label="站点名称"></el-table-column>
+        <el-table-column prop="fontSize" label="字体大小"></el-table-column>
         <el-table-column prop="display" label="显示内容"></el-table-column>
         <el-table-column prop="earlyDisplay" label="预警内容"></el-table-column>
         <el-table-column prop="policeDisplay" label="报警内容"></el-table-column>
@@ -54,6 +50,8 @@
         </el-table-column>
       </el-table>
     </div>
+    <!-- </div> -->
+
     <!-- 新增/修改 -->
     <el-dialog :title="title" :visible.sync="yzaddflag" width="40%">
       <div>
@@ -67,14 +65,17 @@
             <el-input size="small" v-model="ruleForm.idsName"></el-input>
           </el-form-item>
           <el-form-item label="站点编号" prop="siteNo">
-            <el-input size="small" v-model="ruleForm.siteNo"></el-input>
+            <el-input size="small" v-model="ruleForm.siteNo" readonly="true"></el-input>
           </el-form-item>
           <el-form-item label="站点名称" prop="siteName">
-            <el-input size="small" v-model="ruleForm.siteName"></el-input>
+            <el-input size="small" v-model="ruleForm.siteName" readonly="true"></el-input>
           </el-form-item>
           <el-form-item label="显示内容" prop="display">
             <el-input type="textarea" v-model="ruleForm.display"></el-input>
           </el-form-item>
+          <el-form-item label="字体大小" prop="fontSize">
+            <el-input type="number" size="small" v-model="ruleForm.fontSize" min="0" max="40"></el-input>
+          </el-form-item>
           <el-form-item label="预警值" prop="earlyValue">
             <el-input size="small" type="number" v-model="ruleForm.earlyValue"></el-input>
           </el-form-item>
@@ -102,9 +103,112 @@
         <el-button type="primary" @click="deletesite()">确 定</el-button>
       </span>
     </el-dialog>
+    <!-- 分组管理 -->
+    <el-dialog title="分组管理" :visible.sync="FenZuflag" width="600px">
+      <div id="DialogSearch">
+        <el-button type="primary" @click="LoadFZData()" size="mini">刷新</el-button>
+        <el-button type="primary" icon="el-icon-plus" @click="AddFenZu()" size="mini">新增分组</el-button>
+      </div>
+      <div id="DialogCentent">
+        <el-table :data="FZTableData" style="width: 100%;height:calc(100% - 45px)" stripe>
+          <el-table-column prop="groupName" label="分组名称"></el-table-column>
+          <el-table-column label="操作">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                size="small"
+                @click="EditFZ(scope.$index, scope.row)"
+                style="margin:0 10px"
+              >修改名称</el-button>
+              <el-button
+                type="text"
+                size="small"
+                @click="DelfZ(scope.$index, scope.row)"
+                style="margin:0 10px"
+              >删除分组</el-button>
+              <el-button
+                type="text"
+                size="small"
+                @click="SiteGuanl(scope.$index, scope.row)"
+                style="margin:0 10px"
+              >站点管理</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <!-- 新增 / 修改 分组名称 -->
+      <el-dialog
+        :visible.sync="FenZuflag2"
+        width="400px"
+        append-to-body
+        top="20%"
+        :title="FenzuTitle"
+      >
+        <el-input placeholder="请输入分组名称" v-model="AddFZInput" clearable></el-input>
+        <el-button type="primary" size="small" @click="AddFenZuUpdata()">确定</el-button>
+      </el-dialog>
+      <!-- 分组分配站点 -->
+      <el-dialog :visible.sync="SiteDialog" width="400px" append-to-body top="10%" title="已分配站点">
+        <div id="DialogSearch2">
+          <el-button type="primary" @click="LoadSiteData()" size="mini">刷新</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="AddSiteu()" size="mini">新增站点</el-button>
+        </div>
+        <div id="DialogCentent2">
+          <el-table :data="SiteTableData" style="width: 100%;height:calc(100% - 45px)" stripe>
+            <el-table-column prop="siteName" label="站点名称"></el-table-column>
+            <el-table-column label="操作">
+              <template slot-scope="scope">
+                <el-button
+                  type="text"
+                  size="small"
+                  @click="Delsite(scope.$index, scope.row)"
+                  style="margin:0 10px"
+                >删除站点</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <el-dialog :visible.sync="NoSiteDialog" width="700px" append-to-body top="10%" title="新增站点">
+          <div class="DialogSearch2">
+            <el-input placeholder="请输入内容" v-model="loadNoFPSiteInput" clearable></el-input>
+            <el-button type="primary" @click="loadNoFPSite()" size="mini">搜索</el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-plus"
+              @click="AddNoSiteupdata()"
+              size="mini"
+            >分配已勾选的站点</el-button>
+          </div>
+          <div class="DialogCentent2">
+            <el-table
+              :data="NoSiteData"
+              style="width: 100%;height:calc(100% - 45px)"
+              stripe
+              @selection-change="handleSelectionChange"
+              tooltip-effect="dark"
+              show-overflow-tooltip="true"
+            >
+              <el-table-column type="selection" width="55"></el-table-column>
+              <el-table-column prop="siteName" label="站点名称"></el-table-column>
+            </el-table>
+            <el-pagination
+              @size-change="PRSizeChange"
+              @current-change="PRCurrentChange"
+              :current-page="PRPage"
+              :page-sizes="[10, 20, 50, 100]"
+              :page-size="PRSize"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="PRDatagridDataLength"
+              style="margin-top:10px;"
+            ></el-pagination>
+          </div>
+        </el-dialog>
+      </el-dialog>
+    </el-dialog>
   </div>
 </template>
 <script>
+import { message } from "./../../util/item";
 export default {
   name: "LEDConfig",
   data() {
@@ -124,6 +228,7 @@
         display: "",
         earlyValue: "",
         earlyDisplay: "",
+        fontSize: "",
         policeValue: "",
         policeDisplay: ""
       },
@@ -177,6 +282,13 @@
             trigger: "blur"
           }
         ],
+        fontSize: [
+          {
+            required: true,
+            message: "此项为必填项",
+            trigger: "blur"
+          }
+        ],
         policeValue: [
           {
             required: true,
@@ -192,36 +304,108 @@
           }
         ]
       },
-      // 删除
-      deleteflag: false
+      ProjectOptions: [], //分组的数据源
+      Project: "", //分组ID
+      Site: "", //站点
+      SiteOptions: [], //站点的数据源
+      deleteflag: false,
+      FenZuflag: false, //分组管理弹窗
+      FZTableData: [], //分组数据
+      FenZuflag2: false, //新增 / 修改 分组弹窗
+      FenZuflag2type: 1, //1为新增 2为修改
+      FenzuTitle: "", //弹窗的title
+      AddFZInput: "",
+      ClickID: "", //点击修改 以及 删除 的分组ID
+      SiteDialog: false, //站点管理弹窗
+      SiteDialogID: "", //站点管理弹窗
+      SiteTableData: [], //站点表格数据
+      NoSiteDialog: false, //未分配的站点弹窗状态
+      NoSiteData: [], //未分配的站点数据
+      idList2: [], //记录点击的站点的id
+      PRPage: 1, //分页默认显示页
+      PRDatagridDataLength: 0, //分页上显示的数据总条数
+      PRSize: 10, //分页上显示的每页的条数
+      multipleSelection: [],
+      loadNoFPSiteInput: "" //模糊搜索未分配站点
     };
   },
   mounted() {
-    this.getleddata();
+    this.LoadFenZu();
+    // this.getleddata();
     this.getLed();
   },
   methods: {
     search() {},
+    // 获取分组信息
+    LoadFenZu() {
+      this.$http
+        .post(this.nozzle.subtitlesledQuerySiteGroup)
+        .then(response => {
+          if (response.data.data.list.length > 0) {
+            this.ProjectOptions = response.data.data.list;
+            this.Project = this.ProjectOptions[0].id;
+            this.loadProjectUser(this.Project);
+          } else {
+            this.$message({
+              showClose: true,
+              message: "无分组",
+              type: "warning"
+            });
+          }
+        })
+        .catch(response => {
+          // this.$message({
+          //   showClose: true,
+          //   message: "请求分组失败",
+          //   type: "warning"
+          // });
+        });
+    },
+    // 点积分组
+    loadProjectUser(vId) {
+      this.SiteOptions = [];
+      this.$http
+        .post(this.nozzle.subtitlesledQuerySiteGroup, {
+          parentId: vId
+        })
+        .then(response => {
+          if (response.data.data.list.length > 0) {
+            this.SiteOptions = response.data.data.list;
+            this.Site = this.SiteOptions[0].siteNo;
+            this.getleddata();
+          } else {
+            this.$message({
+              showClose: true,
+              message: "无站点",
+              type: "warning"
+            });
+          }
+        })
+        .catch(response => {
+          message(response);
+        });
+    },
     //  获取设备信息
     getleddata() {
       let url = this.nozzle.subtitlesLedQuery;
-      this.$http.post(url).then(res => {
-        if (res.data.code == 0) {
-          if (res.data.data == null) {
-            this.$message({
-              message: "暂无数据",
-              type: "warning"
-            });
+      this.$http
+        .post(url, {
+          siteNo: this.Site
+        })
+        .then(res => {
+          if (res.data.code == 200) {
+            if (res.data.data == null) {
+              this.$message({
+                message: "暂无数据",
+                type: "warning"
+              });
+            } else {
+              this.list = res.data.data;
+            }
           } else {
-            this.list = res.data.data;
+            message(response);
           }
-        } else {
-          this.$message({
-            message: "获取信息失败",
-            type: "error"
-          });
-        }
-      });
+        });
     },
     // 推送
     sendmsg(index, rows) {
@@ -230,7 +414,7 @@
       fd.append("idsDev", idsdev);
       let url = this.nozzle.subtitlesLedSend;
       this.$http.post(url, fd).then(res => {
-        if (res.data.code == 0) {
+        if (res.data.code == 200) {
           this.$message({
             message: "推送成功",
             type: "success"
@@ -247,13 +431,20 @@
     getLed() {
       let url = this.nozzle.subtitlesLedQueryLedNo;
       this.$http.post(url).then(res => {
-        if (res.data.code == 0) {
+        if (res.data.code == 200) {
           this.ledlist = res.data.data;
         }
       });
     },
     addform(formName) {
       this.title = "新增";
+      this.ruleForm.siteNo = this.Site;
+      for (var i = 0; i < this.SiteOptions.length; i++) {
+        if (this.Site == this.SiteOptions[0].siteNo) {
+          this.ruleForm.siteName = this.SiteOptions[0].siteName;
+        }
+      }
+
       this.yzaddflag = true;
       this.selflag = false;
       this.$refs[formName].resetFields();
@@ -336,6 +527,210 @@
             message: "已取消删除"
           });
         });
+    },
+    // 分组管理
+    FenZu() {
+      this.FenZuflag = true;
+      this.LoadFZData();
+    },
+    // 加载分组信息
+    LoadFZData() {
+      this.$http
+        .post(this.nozzle.subtitlesledQuerySiteGroup)
+        .then(response => {
+          this.FZTableData = response.data.data.list;
+        })
+        .catch(response => {});
+    },
+    // 分组新增弹窗
+    AddFenZu() {
+      this.FenZuflag2 = true;
+      this.AddFZInput = "";
+      this.FenzuTitle = "新增分组";
+      this.FenZuflag2type = 1;
+    },
+    // 分组新增/修改 提交
+    AddFenZuUpdata() {
+      if (this.AddFZInput.length == "") {
+        this.$message({
+          showClose: true,
+          message: "请输入分组名称后再新增",
+          type: "warning"
+        });
+        return;
+      }
+      if (this.FenZuflag2type == 1) {
+        // 新增
+        var params2 = [
+          {
+            groupName: this.AddFZInput
+          }
+        ];
+        this.$http
+          .post(this.nozzle.subtitlesledaddSiteGroup, params2)
+          .then(response => {
+            message(response);
+            this.FenZuflag2 = false;
+            this.LoadFZData();
+          })
+          .catch(response => {});
+      } else {
+        // 修改
+        var params2 = {
+          groupName: this.AddFZInput,
+          id: this.ClickID
+        };
+        this.$http
+          .post(this.nozzle.subtitlesledUpdateSiteGroup, params2)
+          .then(response => {
+            message(response);
+            this.FenZuflag2 = false;
+            this.LoadFZData();
+          })
+          .catch(response => {});
+      }
+    },
+    // 分组修改
+    EditFZ(index, rows) {
+      this.FenZuflag2 = true;
+      this.FenzuTitle = "修改分组";
+      this.FenZuflag2type = 2;
+      this.AddFZInput = rows.groupName;
+      this.ClickID = rows.id;
+    },
+    // 删除
+    DelfZ(index, rows) {
+      this.$confirm("此操作将永久删除该信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          var DelID = [];
+          DelID.push(rows.id);
+          this.$http
+            .post(this.nozzle.subtitlesleddeleteSiteGroup, DelID)
+            .then(response => {
+              message(response);
+              this.LoadFZData();
+            })
+            .catch(response => {
+              message(response);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除"
+          });
+        });
+    },
+    // 分组站点分配
+    SiteGuanl(index, rows) {
+      this.SiteDialog = true;
+      this.SiteDialogID = rows.id;
+      this.LoadSiteData();
+    },
+    // 分组站点分配数据
+    LoadSiteData() {
+      this.$http
+        .post(this.nozzle.subtitlesledQuerySiteGroup, {
+          parentId: this.SiteDialogID
+        })
+        .then(response => {
+          this.SiteTableData = response.data.data.list;
+        })
+        .catch(response => {
+          message(response);
+        });
+    },
+    // 删除站点
+    Delsite(index, rows) {
+      this.$confirm("此操作将永久删除该信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          var DelID = [];
+          DelID.push(rows.id);
+          this.$http
+            .post(this.nozzle.subtitlesleddeleteSiteGroup, DelID)
+            .then(response => {
+              message(response);
+              this.LoadSiteData();
+            })
+            .catch(response => {
+              message(response);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除"
+          });
+        });
+    },
+    // 新增站点
+    AddSiteu() {
+      this.NoSiteDialog = true;
+      this.loadNoFPSite();
+    },
+    // 获取未分配的站点
+    loadNoFPSite() {
+      var params = {
+        siteName: this.loadNoFPSiteInput,
+        page: this.PRPage,
+        rows: this.PRSize
+      };
+      this.$http
+        .post(this.nozzle.subtitlesledQuerySiteMes, params)
+        .then(response => {
+          this.NoSiteData = response.data.data.list;
+          this.PRDatagridDataLength = response.data.data.totalCount;
+        })
+        .catch(response => {
+          message(response);
+        });
+    },
+    PRSizeChange(val) {
+      // 改变每页的条数
+      this.PRSize = val;
+      this.loadNoFPSite();
+    },
+    PRCurrentChange(val) {
+      console.log(val);
+      //改变页数
+      this.PRPage = val;
+      this.loadNoFPSite();
+    },
+    // 多选
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    AddNoSiteupdata() {
+      if (this.multipleSelection.length == 0) {
+        this.$message({
+          showClose: true,
+          message: "请勾选站点后再新增",
+          type: "warning"
+        });
+        return;
+      }
+
+      for (var i = 0; i < this.multipleSelection.length; i++) {
+        this.multipleSelection[i].parentId = this.SiteDialogID;
+      }
+      this.$http
+        .post(this.nozzle.subtitlesledaddSiteGroup, this.multipleSelection)
+        .then(response => {
+          message(response);
+          this.NoSiteDialog = false;
+          this.LoadSiteData();
+        })
+        .catch(response => {
+          message(response);
+        });
     }
   }
 };
@@ -348,13 +743,20 @@
   position: relative;
   padding: 10px;
 }
-
+.SelectTitle {
+  display: inline-block;
+  margin-left: 5px;
+  text-align: center;
+  height: 60px;
+  line-height: 60px;
+  color: white;
+}
 .tab {
   height: 50px;
   display: flex;
   justify-content: flex-start;
   align-items: center;
-  background: rgba(53, 53, 53, 0.5);
+  background: rgba(225, 225, 225, 0.1);
 }
 
 .tabbox {
@@ -410,10 +812,10 @@
 }
 
 .tableBox {
-  height: calc(100% - 80px);
+  height: calc(100% - 60px);
   width: 100%;
   overflow: auto;
-  background: rgba(53, 53, 53, 0.5);
+  background: rgba(225, 225, 225, 0.1);
 }
 
 table {
@@ -425,7 +827,7 @@
   color: #fff;
   font-size: 15px;
   height: 45px;
-  background: rgba(53, 53, 53, 0.5);
+  background: rgba(225, 225, 225, 0.1);
 }
 
 .tbody {
@@ -456,4 +858,48 @@
   cursor: pointer;
   margin-right: 10px;
 }
+.el-form-item {
+  margin-bottom: 14px;
+}
+
+/* 弹窗 */
+#DialogSearch {
+  width: 100%;
+  height: 60px;
+  line-height: 60px;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.2);
+  box-sizing: border-box;
+  text-align: left;
+}
+#DialogSearch .el-input {
+  width: 250px;
+  margin: 0 10px;
+}
+#DialogCentent {
+  width: 100%;
+  height: 600px;
+}
+/* 弹窗 */
+#DialogSearch2 {
+  width: 100%;
+  height: 60px;
+  line-height: 60px;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.2);
+  box-sizing: border-box;
+  text-align: left;
+}
+#DialogSearch2 .el-input {
+  width: 250px;
+  margin: 0 10px;
+}
+#DialogCentent2 {
+  width: 100%;
+  height: 400px;
+}
+.el-dialog__body {
+  padding-top: 0 !important;
+}
+.el-dialog__header {
+  text-align: center !important;
+}
 </style>

diff --git a/config/index.js b/config/index.js
index 8e3d0f7..d80aa13 100644
--- a/config/index.js
+++ b/config/index.js
@@ -11,13 +11,13 @@
     assetsPublicPath: '/',
     proxyTable: {
       '/warnApi': {
-          // 测试环境 黄加林
-          'target': 'http://192.168.30.205:8286', // 接口域名
-          // 'target': 'http://192.168.30.30:8001/api', // 服务器接口
-          'changeOrigin': true, //是否跨域
-          'pathRewrite': {
-              '^/warnApi': '' //需要rewrite重写的,
-          }
+        // 测试环境 黄加林
+        'target': 'http://192.168.30.205:8286', // 接口域名
+        // 'target': 'http://192.168.30.30:8001/api', // 服务器接口
+        'changeOrigin': true, //是否跨域
+        'pathRewrite': {
+          '^/warnApi': '' //需要rewrite重写的,
+        }
       },
       '/Api': {
         // 测试环境 陈洪刚
@@ -42,7 +42,7 @@
       '/led': {
         // 测试环境
         // 'target': 'http://192.168.30.189:8800', // 接口域名
-        'target': 'http://192.168.30.15:9200', // 谢阳
+        'target': 'http://192.168.30.15:9209', // 谢阳
         // 'target': 'http://192.168.30.30:8001/api', // 服务器接口
         'changeOrigin': true, //是否跨域
         'pathRewrite': {
diff --git a/src/components/LED/LEDConfig.vue b/src/components/LED/LEDConfig.vue
index 095e53a..820c265 100644
--- a/src/components/LED/LEDConfig.vue
+++ b/src/components/LED/LEDConfig.vue
@@ -1,46 +1,42 @@
 <template>
   <div id="LEDConfig">
     <div class="formBox">
-      <label for>请输入设备编号：</label>
-      <el-input size="small" v-model="query" placeholder="设备编号"></el-input>
+      <span class="SelectTitle">LED屏分组：</span>
+      <el-select
+        v-model="Project"
+        filterable
+        placeholder="请选择分组"
+        @change="loadProjectUser(Project)"
+      >
+        <el-option
+          v-for="item in ProjectOptions"
+          :key="item.index"
+          :label="item.groupName"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+      <span class="SelectTitle">选择站点：</span>
+      <el-select v-model="Site" filterable placeholder="请选择站点">
+        <el-option
+          v-for="item in SiteOptions"
+          :key="item.index"
+          :label="item.field"
+          :value="item.siteNo"
+        ></el-option>
+      </el-select>
+      <!-- <label for>请输入设备编号：</label>
+      <el-input size="small" v-model="query" placeholder="设备编号"></el-input>-->
       <span id="search" @click="getleddata()">查询</span>
       <span id="search" @click="addform('ruleForm')">新增</span>
+      <span id="search" @click="FenZu()">分组管理</span>
     </div>
     <div class="tableBox">
-      <!-- <table>
-        <tr class="thead">
-          <th>设备编号</th>
-          <th>设备名称</th>
-          <th>站点编号</th>
-          <th>站点名称</th>
-          <th>显示内容</th>
-          <th>预警内容</th>
-          <th>报警内容</th>
-          <th>是否在线</th>
-          <th>操作</th>
-        </tr>
-        <tr class="tbody" v-for="(item,index) in list" :key="index">
-          <td>{{item.idsDev}}</td>
-          <td>{{item.idsName}}</td>
-          <td>{{item.siteNo}}</td>
-          <td>{{item.siteName}}</td>
-          <td>{{item.display}}</td>
-          <td>{{item.earlyDisplay}}</td>
-          <td>{{item.policeDisplay}}</td>
-          <td v-if="item.onlineType == 1">在线</td>
-          <td v-else>离线</td>
-          <td>
-            <span class="tdbtn" @click="sendmsg(item.idsDev)">推送</span>
-            <span class="tdbtn" @click="update(item.idsDev)">修改</span>
-            <span class="tdbtn" @click="deletewarn(item.idsDev)">删除</span>
-          </td>
-        </tr>
-      </table>-->
       <el-table :data="list" style="width: 100%;height:calc(100% - 45px)">
         <el-table-column prop="idsDev" label="设备编号"></el-table-column>
         <el-table-column prop="idsName" label="设备名称"></el-table-column>
         <el-table-column prop="siteNo" label="站点编号"></el-table-column>
         <el-table-column prop="siteName" label="站点名称"></el-table-column>
+        <el-table-column prop="fontSize" label="字体大小"></el-table-column>
         <el-table-column prop="display" label="显示内容"></el-table-column>
         <el-table-column prop="earlyDisplay" label="预警内容"></el-table-column>
         <el-table-column prop="policeDisplay" label="报警内容"></el-table-column>
@@ -54,6 +50,8 @@
         </el-table-column>
       </el-table>
     </div>
+    <!-- </div> -->
+
     <!-- 新增/修改 -->
     <el-dialog :title="title" :visible.sync="yzaddflag" width="40%">
       <div>
@@ -67,14 +65,17 @@
             <el-input size="small" v-model="ruleForm.idsName"></el-input>
           </el-form-item>
           <el-form-item label="站点编号" prop="siteNo">
-            <el-input size="small" v-model="ruleForm.siteNo"></el-input>
+            <el-input size="small" v-model="ruleForm.siteNo" readonly="true"></el-input>
           </el-form-item>
           <el-form-item label="站点名称" prop="siteName">
-            <el-input size="small" v-model="ruleForm.siteName"></el-input>
+            <el-input size="small" v-model="ruleForm.siteName" readonly="true"></el-input>
           </el-form-item>
           <el-form-item label="显示内容" prop="display">
             <el-input type="textarea" v-model="ruleForm.display"></el-input>
           </el-form-item>
+          <el-form-item label="字体大小" prop="fontSize">
+            <el-input type="number" size="small" v-model="ruleForm.fontSize" min="0" max="40"></el-input>
+          </el-form-item>
           <el-form-item label="预警值" prop="earlyValue">
             <el-input size="small" type="number" v-model="ruleForm.earlyValue"></el-input>
           </el-form-item>
@@ -102,9 +103,112 @@
         <el-button type="primary" @click="deletesite()">确 定</el-button>
       </span>
     </el-dialog>
+    <!-- 分组管理 -->
+    <el-dialog title="分组管理" :visible.sync="FenZuflag" width="600px">
+      <div id="DialogSearch">
+        <el-button type="primary" @click="LoadFZData()" size="mini">刷新</el-button>
+        <el-button type="primary" icon="el-icon-plus" @click="AddFenZu()" size="mini">新增分组</el-button>
+      </div>
+      <div id="DialogCentent">
+        <el-table :data="FZTableData" style="width: 100%;height:calc(100% - 45px)" stripe>
+          <el-table-column prop="groupName" label="分组名称"></el-table-column>
+          <el-table-column label="操作">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                size="small"
+                @click="EditFZ(scope.$index, scope.row)"
+                style="margin:0 10px"
+              >修改名称</el-button>
+              <el-button
+                type="text"
+                size="small"
+                @click="DelfZ(scope.$index, scope.row)"
+                style="margin:0 10px"
+              >删除分组</el-button>
+              <el-button
+                type="text"
+                size="small"
+                @click="SiteGuanl(scope.$index, scope.row)"
+                style="margin:0 10px"
+              >站点管理</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <!-- 新增 / 修改 分组名称 -->
+      <el-dialog
+        :visible.sync="FenZuflag2"
+        width="400px"
+        append-to-body
+        top="20%"
+        :title="FenzuTitle"
+      >
+        <el-input placeholder="请输入分组名称" v-model="AddFZInput" clearable></el-input>
+        <el-button type="primary" size="small" @click="AddFenZuUpdata()">确定</el-button>
+      </el-dialog>
+      <!-- 分组分配站点 -->
+      <el-dialog :visible.sync="SiteDialog" width="400px" append-to-body top="10%" title="已分配站点">
+        <div id="DialogSearch2">
+          <el-button type="primary" @click="LoadSiteData()" size="mini">刷新</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="AddSiteu()" size="mini">新增站点</el-button>
+        </div>
+        <div id="DialogCentent2">
+          <el-table :data="SiteTableData" style="width: 100%;height:calc(100% - 45px)" stripe>
+            <el-table-column prop="siteName" label="站点名称"></el-table-column>
+            <el-table-column label="操作">
+              <template slot-scope="scope">
+                <el-button
+                  type="text"
+                  size="small"
+                  @click="Delsite(scope.$index, scope.row)"
+                  style="margin:0 10px"
+                >删除站点</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <el-dialog :visible.sync="NoSiteDialog" width="700px" append-to-body top="10%" title="新增站点">
+          <div class="DialogSearch2">
+            <el-input placeholder="请输入内容" v-model="loadNoFPSiteInput" clearable></el-input>
+            <el-button type="primary" @click="loadNoFPSite()" size="mini">搜索</el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-plus"
+              @click="AddNoSiteupdata()"
+              size="mini"
+            >分配已勾选的站点</el-button>
+          </div>
+          <div class="DialogCentent2">
+            <el-table
+              :data="NoSiteData"
+              style="width: 100%;height:calc(100% - 45px)"
+              stripe
+              @selection-change="handleSelectionChange"
+              tooltip-effect="dark"
+              show-overflow-tooltip="true"
+            >
+              <el-table-column type="selection" width="55"></el-table-column>
+              <el-table-column prop="siteName" label="站点名称"></el-table-column>
+            </el-table>
+            <el-pagination
+              @size-change="PRSizeChange"
+              @current-change="PRCurrentChange"
+              :current-page="PRPage"
+              :page-sizes="[10, 20, 50, 100]"
+              :page-size="PRSize"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="PRDatagridDataLength"
+              style="margin-top:10px;"
+            ></el-pagination>
+          </div>
+        </el-dialog>
+      </el-dialog>
+    </el-dialog>
   </div>
 </template>
 <script>
+import { message } from "./../../util/item";
 export default {
   name: "LEDConfig",
   data() {
@@ -124,6 +228,7 @@
         display: "",
         earlyValue: "",
         earlyDisplay: "",
+        fontSize: "",
         policeValue: "",
         policeDisplay: ""
       },
@@ -177,6 +282,13 @@
             trigger: "blur"
           }
         ],
+        fontSize: [
+          {
+            required: true,
+            message: "此项为必填项",
+            trigger: "blur"
+          }
+        ],
         policeValue: [
           {
             required: true,
@@ -192,36 +304,108 @@
           }
         ]
       },
-      // 删除
-      deleteflag: false
+      ProjectOptions: [], //分组的数据源
+      Project: "", //分组ID
+      Site: "", //站点
+      SiteOptions: [], //站点的数据源
+      deleteflag: false,
+      FenZuflag: false, //分组管理弹窗
+      FZTableData: [], //分组数据
+      FenZuflag2: false, //新增 / 修改 分组弹窗
+      FenZuflag2type: 1, //1为新增 2为修改
+      FenzuTitle: "", //弹窗的title
+      AddFZInput: "",
+      ClickID: "", //点击修改 以及 删除 的分组ID
+      SiteDialog: false, //站点管理弹窗
+      SiteDialogID: "", //站点管理弹窗
+      SiteTableData: [], //站点表格数据
+      NoSiteDialog: false, //未分配的站点弹窗状态
+      NoSiteData: [], //未分配的站点数据
+      idList2: [], //记录点击的站点的id
+      PRPage: 1, //分页默认显示页
+      PRDatagridDataLength: 0, //分页上显示的数据总条数
+      PRSize: 10, //分页上显示的每页的条数
+      multipleSelection: [],
+      loadNoFPSiteInput: "" //模糊搜索未分配站点
     };
   },
   mounted() {
-    this.getleddata();
+    this.LoadFenZu();
+    // this.getleddata();
     this.getLed();
   },
   methods: {
     search() {},
+    // 获取分组信息
+    LoadFenZu() {
+      this.$http
+        .post(this.nozzle.subtitlesledQuerySiteGroup)
+        .then(response => {
+          if (response.data.data.list.length > 0) {
+            this.ProjectOptions = response.data.data.list;
+            this.Project = this.ProjectOptions[0].id;
+            this.loadProjectUser(this.Project);
+          } else {
+            this.$message({
+              showClose: true,
+              message: "无分组",
+              type: "warning"
+            });
+          }
+        })
+        .catch(response => {
+          // this.$message({
+          //   showClose: true,
+          //   message: "请求分组失败",
+          //   type: "warning"
+          // });
+        });
+    },
+    // 点积分组
+    loadProjectUser(vId) {
+      this.SiteOptions = [];
+      this.$http
+        .post(this.nozzle.subtitlesledQuerySiteGroup, {
+          parentId: vId
+        })
+        .then(response => {
+          if (response.data.data.list.length > 0) {
+            this.SiteOptions = response.data.data.list;
+            this.Site = this.SiteOptions[0].siteNo;
+            this.getleddata();
+          } else {
+            this.$message({
+              showClose: true,
+              message: "无站点",
+              type: "warning"
+            });
+          }
+        })
+        .catch(response => {
+          message(response);
+        });
+    },
     //  获取设备信息
     getleddata() {
       let url = this.nozzle.subtitlesLedQuery;
-      this.$http.post(url).then(res => {
-        if (res.data.code == 0) {
-          if (res.data.data == null) {
-            this.$message({
-              message: "暂无数据",
-              type: "warning"
-            });
+      this.$http
+        .post(url, {
+          siteNo: this.Site
+        })
+        .then(res => {
+          if (res.data.code == 200) {
+            if (res.data.data == null) {
+              this.$message({
+                message: "暂无数据",
+                type: "warning"
+              });
+            } else {
+              this.list = res.data.data;
+            }
           } else {
-            this.list = res.data.data;
+            message(response);
           }
-        } else {
-          this.$message({
-            message: "获取信息失败",
-            type: "error"
-          });
-        }
-      });
+        });
     },
     // 推送
     sendmsg(index, rows) {
@@ -230,7 +414,7 @@
       fd.append("idsDev", idsdev);
       let url = this.nozzle.subtitlesLedSend;
       this.$http.post(url, fd).then(res => {
-        if (res.data.code == 0) {
+        if (res.data.code == 200) {
           this.$message({
             message: "推送成功",
             type: "success"
@@ -247,13 +431,20 @@
     getLed() {
       let url = this.nozzle.subtitlesLedQueryLedNo;
       this.$http.post(url).then(res => {
-        if (res.data.code == 0) {
+        if (res.data.code == 200) {
           this.ledlist = res.data.data;
         }
       });
     },
     addform(formName) {
       this.title = "新增";
+      this.ruleForm.siteNo = this.Site;
+      for (var i = 0; i < this.SiteOptions.length; i++) {
+        if (this.Site == this.SiteOptions[0].siteNo) {
+          this.ruleForm.siteName = this.SiteOptions[0].siteName;
+        }
+      }
+
       this.yzaddflag = true;
       this.selflag = false;
       this.$refs[formName].resetFields();
@@ -336,6 +527,210 @@
             message: "已取消删除"
           });
         });
+    },
+    // 分组管理
+    FenZu() {
+      this.FenZuflag = true;
+      this.LoadFZData();
+    },
+    // 加载分组信息
+    LoadFZData() {
+      this.$http
+        .post(this.nozzle.subtitlesledQuerySiteGroup)
+        .then(response => {
+          this.FZTableData = response.data.data.list;
+        })
+        .catch(response => {});
+    },
+    // 分组新增弹窗
+    AddFenZu() {
+      this.FenZuflag2 = true;
+      this.AddFZInput = "";
+      this.FenzuTitle = "新增分组";
+      this.FenZuflag2type = 1;
+    },
+    // 分组新增/修改 提交
+    AddFenZuUpdata() {
+      if (this.AddFZInput.length == "") {
+        this.$message({
+          showClose: true,
+          message: "请输入分组名称后再新增",
+          type: "warning"
+        });
+        return;
+      }
+      if (this.FenZuflag2type == 1) {
+        // 新增
+        var params2 = [
+          {
+            groupName: this.AddFZInput
+          }
+        ];
+        this.$http
+          .post(this.nozzle.subtitlesledaddSiteGroup, params2)
+          .then(response => {
+            message(response);
+            this.FenZuflag2 = false;
+            this.LoadFZData();
+          })
+          .catch(response => {});
+      } else {
+        // 修改
+        var params2 = {
+          groupName: this.AddFZInput,
+          id: this.ClickID
+        };
+        this.$http
+          .post(this.nozzle.subtitlesledUpdateSiteGroup, params2)
+          .then(response => {
+            message(response);
+            this.FenZuflag2 = false;
+            this.LoadFZData();
+          })
+          .catch(response => {});
+      }
+    },
+    // 分组修改
+    EditFZ(index, rows) {
+      this.FenZuflag2 = true;
+      this.FenzuTitle = "修改分组";
+      this.FenZuflag2type = 2;
+      this.AddFZInput = rows.groupName;
+      this.ClickID = rows.id;
+    },
+    // 删除
+    DelfZ(index, rows) {
+      this.$confirm("此操作将永久删除该信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          var DelID = [];
+          DelID.push(rows.id);
+          this.$http
+            .post(this.nozzle.subtitlesleddeleteSiteGroup, DelID)
+            .then(response => {
+              message(response);
+              this.LoadFZData();
+            })
+            .catch(response => {
+              message(response);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除"
+          });
+        });
+    },
+    // 分组站点分配
+    SiteGuanl(index, rows) {
+      this.SiteDialog = true;
+      this.SiteDialogID = rows.id;
+      this.LoadSiteData();
+    },
+    // 分组站点分配数据
+    LoadSiteData() {
+      this.$http
+        .post(this.nozzle.subtitlesledQuerySiteGroup, {
+          parentId: this.SiteDialogID
+        })
+        .then(response => {
+          this.SiteTableData = response.data.data.list;
+        })
+        .catch(response => {
+          message(response);
+        });
+    },
+    // 删除站点
+    Delsite(index, rows) {
+      this.$confirm("此操作将永久删除该信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          var DelID = [];
+          DelID.push(rows.id);
+          this.$http
+            .post(this.nozzle.subtitlesleddeleteSiteGroup, DelID)
+            .then(response => {
+              message(response);
+              this.LoadSiteData();
+            })
+            .catch(response => {
+              message(response);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除"
+          });
+        });
+    },
+    // 新增站点
+    AddSiteu() {
+      this.NoSiteDialog = true;
+      this.loadNoFPSite();
+    },
+    // 获取未分配的站点
+    loadNoFPSite() {
+      var params = {
+        siteName: this.loadNoFPSiteInput,
+        page: this.PRPage,
+        rows: this.PRSize
+      };
+      this.$http
+        .post(this.nozzle.subtitlesledQuerySiteMes, params)
+        .then(response => {
+          this.NoSiteData = response.data.data.list;
+          this.PRDatagridDataLength = response.data.data.totalCount;
+        })
+        .catch(response => {
+          message(response);
+        });
+    },
+    PRSizeChange(val) {
+      // 改变每页的条数
+      this.PRSize = val;
+      this.loadNoFPSite();
+    },
+    PRCurrentChange(val) {
+      console.log(val);
+      //改变页数
+      this.PRPage = val;
+      this.loadNoFPSite();
+    },
+    // 多选
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    AddNoSiteupdata() {
+      if (this.multipleSelection.length == 0) {
+        this.$message({
+          showClose: true,
+          message: "请勾选站点后再新增",
+          type: "warning"
+        });
+        return;
+      }
+
+      for (var i = 0; i < this.multipleSelection.length; i++) {
+        this.multipleSelection[i].parentId = this.SiteDialogID;
+      }
+      this.$http
+        .post(this.nozzle.subtitlesledaddSiteGroup, this.multipleSelection)
+        .then(response => {
+          message(response);
+          this.NoSiteDialog = false;
+          this.LoadSiteData();
+        })
+        .catch(response => {
+          message(response);
+        });
     }
   }
 };
@@ -348,13 +743,20 @@
   position: relative;
   padding: 10px;
 }
-
+.SelectTitle {
+  display: inline-block;
+  margin-left: 5px;
+  text-align: center;
+  height: 60px;
+  line-height: 60px;
+  color: white;
+}
 .tab {
   height: 50px;
   display: flex;
   justify-content: flex-start;
   align-items: center;
-  background: rgba(53, 53, 53, 0.5);
+  background: rgba(225, 225, 225, 0.1);
 }
 
 .tabbox {
@@ -410,10 +812,10 @@
 }
 
 .tableBox {
-  height: calc(100% - 80px);
+  height: calc(100% - 60px);
   width: 100%;
   overflow: auto;
-  background: rgba(53, 53, 53, 0.5);
+  background: rgba(225, 225, 225, 0.1);
 }
 
 table {
@@ -425,7 +827,7 @@
   color: #fff;
   font-size: 15px;
   height: 45px;
-  background: rgba(53, 53, 53, 0.5);
+  background: rgba(225, 225, 225, 0.1);
 }
 
 .tbody {
@@ -456,4 +858,48 @@
   cursor: pointer;
   margin-right: 10px;
 }
+.el-form-item {
+  margin-bottom: 14px;
+}
+
+/* 弹窗 */
+#DialogSearch {
+  width: 100%;
+  height: 60px;
+  line-height: 60px;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.2);
+  box-sizing: border-box;
+  text-align: left;
+}
+#DialogSearch .el-input {
+  width: 250px;
+  margin: 0 10px;
+}
+#DialogCentent {
+  width: 100%;
+  height: 600px;
+}
+/* 弹窗 */
+#DialogSearch2 {
+  width: 100%;
+  height: 60px;
+  line-height: 60px;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.2);
+  box-sizing: border-box;
+  text-align: left;
+}
+#DialogSearch2 .el-input {
+  width: 250px;
+  margin: 0 10px;
+}
+#DialogCentent2 {
+  width: 100%;
+  height: 400px;
+}
+.el-dialog__body {
+  padding-top: 0 !important;
+}
+.el-dialog__header {
+  text-align: center !important;
+}
 </style>
diff --git a/src/util/led.js b/src/util/led.js
index bbcee41..8950235 100644
--- a/src/util/led.js
+++ b/src/util/led.js
@@ -7,12 +7,17 @@
 
 let nozzle = {
   'personnelInfo': '/personnel/info', //获取巡检人信息
-  'subtitlesLedQueryLedNo':'/subtitles/led/queryLedNo',//LED屏接口
-  'subtitlesLedQuery':'/subtitles/led/query',//LED屏接口
-  'subtitlesLedSave':'/subtitles/led/save',//LED屏接口
-  'subtitlesLedUpdate':'/subtitles/led/update',//LED屏接口
-  'subtitlesLedDelete':'/subtitles/led/delete',//LED屏接口
-  'subtitlesLedSend':'/subtitles/led/send',//LED屏接口
+  'subtitlesLedQueryLedNo': '/subtitles/led/queryLedNo',//LED屏接口
+  'subtitlesLedQuery': '/subtitles/led/query',//LED屏接口
+  'subtitlesLedSave': '/subtitles/led/save',//LED屏接口
+  'subtitlesLedUpdate': '/subtitles/led/update',//LED屏接口
+  'subtitlesLedDelete': '/subtitles/led/delete',//LED屏接口
+  'subtitlesLedSend': '/subtitles/led/send',//LED屏接口
+  'subtitlesledQuerySiteGroup': '/subtitles/led/querySiteGroup',//LED分组搜索
+  'subtitlesledaddSiteGroup': '/subtitles/led/addSiteGroup',//LED分组新增
+  'subtitlesledUpdateSiteGroup': '/subtitles/led/updateSiteGroup',//LED分组修改
+  'subtitlesleddeleteSiteGroup': '/subtitles/led/deleteSiteGroup',//LED分组删除
+  'subtitlesledQuerySiteMes': '/subtitles/led/querySiteMes',//未分组站点查询
 };
 
 for (let item in nozzle) {