diff --git a/src/App.vue b/src/App.vue
index f3f7bf4..f0ca24c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -202,6 +202,17 @@
 }
 /* 弹窗 Dialog B */
 
+/* 删除弹窗 */
+.el-message-box {
+  background: #000000 !important;
+  border: 1px solid rgb(102, 177, 255);
+}
+.el-message-box__title {
+  color: aqua !important;
+}
+.el-message-box__content {
+  color: white !important;
+}
 /* 新烽查询系统单独样式 A */
 #NFSNo2 .el-table__header tr,
 #NFSNo2 .el-table__header th {

diff --git a/src/App.vue b/src/App.vue
index f3f7bf4..f0ca24c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -202,6 +202,17 @@
 }
 /* 弹窗 Dialog B */
 
+/* 删除弹窗 */
+.el-message-box {
+  background: #000000 !important;
+  border: 1px solid rgb(102, 177, 255);
+}
+.el-message-box__title {
+  color: aqua !important;
+}
+.el-message-box__content {
+  color: white !important;
+}
 /* 新烽查询系统单独样式 A */
 #NFSNo2 .el-table__header tr,
 #NFSNo2 .el-table__header th {
diff --git a/src/components/configure/AlarmConfiguration.vue b/src/components/configure/AlarmConfiguration.vue
index 1c1aee1..d9e7290 100644
--- a/src/components/configure/AlarmConfiguration.vue
+++ b/src/components/configure/AlarmConfiguration.vue
@@ -37,7 +37,7 @@
       <div id="DialogSearch">
         <el-input placeholder="请输入因子名" v-model="YZValue" clearable></el-input>
         <el-button type="primary" icon="el-icon-search" @click="loadGridDataYZ()">搜索</el-button>
-        <el-button type="primary" icon="el-icon-plus">新增警戒线</el-button>
+        <el-button type="primary" icon="el-icon-plus" @click="AddJinJieXian()">新增警戒线</el-button>
       </div>
       <div id="DialogCentent">
         <el-table :data="YZTableData" style="width: 100%;height:calc(100% - 45px)" stripe>
@@ -72,29 +72,35 @@
       <el-dialog :visible.sync="dialogVisible2" width="400px" append-to-body top="20%">
         <div class="Dialog2List">
           <span class="Dialog2ListName">级&nbsp;&nbsp;&nbsp;&nbsp;别:</span>
-          <el-select v-model="Dialog2warnType" filterable placeholder="请选择" @change="selectV()">
+          <el-select v-model="Dialog2warnType" filterable placeholder="请选择级别" :disabled="!isAdd">
             <el-option
               v-for="item in Dialog2JB"
               :key="item.warnType"
-              :label="item.name"
+              :label="item.warnTypeDesc"
               :value="item.warnType"
             ></el-option>
           </el-select>
         </div>
         <div class="Dialog2List">
           <span class="Dialog2ListName">因&nbsp;&nbsp;&nbsp;&nbsp;子:</span>
-          <el-select v-model="Dialog2factors" filterable placeholder="请选择" @change="selectV()">
+          <el-select
+            v-model="Dialog2factors"
+            filterable
+            placeholder="请选择因子"
+            :disabled="!isAdd"
+            @change="Dialog2factorsChange"
+          >
             <el-option
               v-for="item in Dialog2YZ"
               :key="item.index"
-              :label="item.warnTypeDesc"
-              :value="item.platformCode"
+              :label="item.factorsName"
+              :value="item.factorsAscii"
             ></el-option>
           </el-select>
         </div>
         <div class="Dialog2List">
           <span class="Dialog2ListName">运算符:</span>
-          <el-select v-model="Dialog2compareWay" filterable placeholder="请选择" @change="selectV()">
+          <el-select v-model="Dialog2compareWay" filterable placeholder="请选择运算符">
             <el-option
               v-for="item in Dialog2YSF"
               :key="item.index"
@@ -105,11 +111,19 @@
         </div>
         <div class="Dialog2List">
           <span class="Dialog2ListName">线&nbsp;&nbsp;&nbsp;&nbsp;值:</span>
-          <el-input placeholder="请输入线值" v-model="warnValue" clearable></el-input>
+          <el-input placeholder="请输入线值" v-model="warnValue" clearable type="number"></el-input>
         </div>
         <div class="Dialog2List">
-          <a href="javascript:void(0)" class="Dialog2ListButton">取&nbsp;&nbsp;&nbsp;&nbsp;消</a>
-          <a href="javascript:void(0)" class="Dialog2ListButton2">确&nbsp;&nbsp;&nbsp;&nbsp;定</a>
+          <a
+            href="javascript:void(0)"
+            class="Dialog2ListButton"
+            @click="dialogVisible2=false"
+          >取&nbsp;&nbsp;&nbsp;&nbsp;消</a>
+          <a
+            href="javascript:void(0)"
+            class="Dialog2ListButton2"
+            @click="EditAndAdd"
+          >确&nbsp;&nbsp;&nbsp;&nbsp;定</a>
         </div>
       </el-dialog>
     </el-dialog>
@@ -117,6 +131,7 @@
 </template>
 
 <script>
+import { message } from "./../../util/item";
 export default {
   name: "AlarmConfiguration",
   data: function() {
@@ -159,7 +174,11 @@
       ], //级别选项
       Dialog2factors: "", //因子
       Dialog2YZ: [], //因子选项
-      warnValue: "" //线值
+      warnValue: "", //线值
+      isAdd: true, //新增为true,修改为false
+      clickplatformCode: "", //点击站点时 保存当前站点所属得平台编号
+      clicksiteName: "", //点击站点时 保存当前站点名称
+      clickYinZiName: "" //选择因子时保存因子名称
     };
   },
   methods: {
@@ -225,9 +244,15 @@
     // 查看详情
     details(index, rows) {
       this.dialogVisible = true;
+      // 保存当前站点编号
       this.SiteSel = rows.stCode;
+      //  保存当前站点名称
+      this.clicksiteName = rows.stName;
+      // 保存当前站点所属得平台编号
+      this.clickplatformCode = rows.platformCode;
       this.loadGridDataYZ();
     },
+
     //分页
     YZSizeChange(val) {
       // 改变每页的条数
@@ -267,20 +292,66 @@
     // 点击编辑因子状态
     Edit(index, rows) {
       this.dialogVisible2 = true;
+      this.isAdd = false;
+      // 默认值回显
+      this.Dialog2warnType = rows.warnType;
+      this.Dialog2compareWay = rows.compareWay;
+      this.warnValue = rows.warnValue;
+      this.Dialog2YZ = [
+        { factorsName: rows.factorsName, factorsAscii: rows.factorsAscii }
+      ];
+      this.Dialog2factors = rows.factorsAscii;
+    },
+    // 删除
+    Del(index, rows) {
+      this.$confirm("此操作将永久删除该信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          var DelID = [];
+          DelID.push(rows.id);
+          this.$http
+            .post(this.nozzle.warnConfigDeleteWarnConfig, DelID)
+            .then(response => {
+              message(response);
+              this.dialogVisible2 = false;
+              this.loadGridDataYZ();
+            })
+            .catch(response => {
+              message(response);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除"
+          });
+        });
+    },
+    // 选择因子
+    Dialog2factorsChange(vId) {
+      let obj = {};
+      obj = this.Dialog2YZ.find(item => {
+        //这里的userList就是上面遍历的数据源
+        return item.factorsAscii === vId; //筛选出匹配数据
+      });
+      this.clickYinZiName = obj.factorsName; //我这边的name就是对应label的
     },
     // 请求未分配的因子
     loadSiteNoYinz() {
+      this.Dialog2YZ = [];
       let params = {
         data: {
-          stCode: this.SiteSel, //站点编号，可不传
+          stCode: this.SiteSel //站点编号，可不传
         }
       };
       this.$http
-        .post(this.nozzle.warnConfigListWarnConfig, params)
+        .post(this.nozzle.warnConfigListNonConfig, params)
         .then(response => {
           if (response.data.code === 200) {
-            this.YZTableData = response.data.data.records;
-            this.YZDatagridDataLength = response.data.data.total;
+            this.Dialog2YZ = response.data.data;
           } else {
             message(response);
           }
@@ -288,6 +359,63 @@
         .catch(response => {
           message(response);
         });
+    },
+    // 新增警戒线
+    AddJinJieXian() {
+      this.dialogVisible2 = true;
+      this.Dialog2warnType = "";
+      this.Dialog2compareWay = "";
+      this.Dialog2factors = "";
+      this.Dialog2YZ = [];
+      this.clickYinZiName = "";
+      this.warnValue = "";
+      this.isAdd = true;
+      this.loadSiteNoYinz();
+    },
+    //确认
+    EditAndAdd() {
+      var params2;
+      if (this.isAdd) {
+        // 新增
+        var URL = this.nozzle.warnConfigInsertWarnConfig;
+        params2 = {
+          data: {
+            siteNo: this.SiteSel, //站点编号
+            siteName: this.clicksiteName, //站点名称
+            platForm: this.clickplatformCode, //平台编号
+            factorsAscii: this.Dialog2factors, //因子ASCII
+            factorsName: this.clickYinZiName, //因子中文名
+            warnValue: this.warnValue, //警戒线值
+            warnType: this.Dialog2warnType, //警戒等级1：预警，2：报警
+            compareWay: this.Dialog2compareWay //比较方式>：大于，<：小于
+          }
+        };
+      } else {
+        // 修改
+        var URL = this.nozzle.warnConfigUpdateWarnConfig;
+        params2 = {
+          data: {
+            siteNo: this.SiteSel, //站点编号
+            factorsAscii: this.Dialog2factors, //因子ASCII
+            warnType: this.Dialog2warnType, //警戒等级1：预警，2：报警
+            // siteName: this.clicksiteName, //站点名称
+            // platForm: this.clickplatformCode, //平台编号
+            /**上三个参数固定，不让修改，但是要传给后台*/
+            warnValue: this.warnValue, //警戒线值
+            compareWay: this.Dialog2compareWay //比较方式>：大于，<：小于
+          }
+        };
+      }
+      this.$http
+        .post(URL, params2)
+        .then(response => {
+          message(response);
+          this.dialogVisible2 = false;
+          this.loadGridDataYZ();
+        })
+        .catch(response => {
+          message(response);
+        });
     }
   },
   mounted: function() {

diff --git a/src/App.vue b/src/App.vue
index f3f7bf4..f0ca24c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -202,6 +202,17 @@
 }
 /* 弹窗 Dialog B */
 
+/* 删除弹窗 */
+.el-message-box {
+  background: #000000 !important;
+  border: 1px solid rgb(102, 177, 255);
+}
+.el-message-box__title {
+  color: aqua !important;
+}
+.el-message-box__content {
+  color: white !important;
+}
 /* 新烽查询系统单独样式 A */
 #NFSNo2 .el-table__header tr,
 #NFSNo2 .el-table__header th {
diff --git a/src/components/configure/AlarmConfiguration.vue b/src/components/configure/AlarmConfiguration.vue
index 1c1aee1..d9e7290 100644
--- a/src/components/configure/AlarmConfiguration.vue
+++ b/src/components/configure/AlarmConfiguration.vue
@@ -37,7 +37,7 @@
       <div id="DialogSearch">
         <el-input placeholder="请输入因子名" v-model="YZValue" clearable></el-input>
         <el-button type="primary" icon="el-icon-search" @click="loadGridDataYZ()">搜索</el-button>
-        <el-button type="primary" icon="el-icon-plus">新增警戒线</el-button>
+        <el-button type="primary" icon="el-icon-plus" @click="AddJinJieXian()">新增警戒线</el-button>
       </div>
       <div id="DialogCentent">
         <el-table :data="YZTableData" style="width: 100%;height:calc(100% - 45px)" stripe>
@@ -72,29 +72,35 @@
       <el-dialog :visible.sync="dialogVisible2" width="400px" append-to-body top="20%">
         <div class="Dialog2List">
           <span class="Dialog2ListName">级&nbsp;&nbsp;&nbsp;&nbsp;别:</span>
-          <el-select v-model="Dialog2warnType" filterable placeholder="请选择" @change="selectV()">
+          <el-select v-model="Dialog2warnType" filterable placeholder="请选择级别" :disabled="!isAdd">
             <el-option
               v-for="item in Dialog2JB"
               :key="item.warnType"
-              :label="item.name"
+              :label="item.warnTypeDesc"
               :value="item.warnType"
             ></el-option>
           </el-select>
         </div>
         <div class="Dialog2List">
           <span class="Dialog2ListName">因&nbsp;&nbsp;&nbsp;&nbsp;子:</span>
-          <el-select v-model="Dialog2factors" filterable placeholder="请选择" @change="selectV()">
+          <el-select
+            v-model="Dialog2factors"
+            filterable
+            placeholder="请选择因子"
+            :disabled="!isAdd"
+            @change="Dialog2factorsChange"
+          >
             <el-option
               v-for="item in Dialog2YZ"
               :key="item.index"
-              :label="item.warnTypeDesc"
-              :value="item.platformCode"
+              :label="item.factorsName"
+              :value="item.factorsAscii"
             ></el-option>
           </el-select>
         </div>
         <div class="Dialog2List">
           <span class="Dialog2ListName">运算符:</span>
-          <el-select v-model="Dialog2compareWay" filterable placeholder="请选择" @change="selectV()">
+          <el-select v-model="Dialog2compareWay" filterable placeholder="请选择运算符">
             <el-option
               v-for="item in Dialog2YSF"
               :key="item.index"
@@ -105,11 +111,19 @@
         </div>
         <div class="Dialog2List">
           <span class="Dialog2ListName">线&nbsp;&nbsp;&nbsp;&nbsp;值:</span>
-          <el-input placeholder="请输入线值" v-model="warnValue" clearable></el-input>
+          <el-input placeholder="请输入线值" v-model="warnValue" clearable type="number"></el-input>
         </div>
         <div class="Dialog2List">
-          <a href="javascript:void(0)" class="Dialog2ListButton">取&nbsp;&nbsp;&nbsp;&nbsp;消</a>
-          <a href="javascript:void(0)" class="Dialog2ListButton2">确&nbsp;&nbsp;&nbsp;&nbsp;定</a>
+          <a
+            href="javascript:void(0)"
+            class="Dialog2ListButton"
+            @click="dialogVisible2=false"
+          >取&nbsp;&nbsp;&nbsp;&nbsp;消</a>
+          <a
+            href="javascript:void(0)"
+            class="Dialog2ListButton2"
+            @click="EditAndAdd"
+          >确&nbsp;&nbsp;&nbsp;&nbsp;定</a>
         </div>
       </el-dialog>
     </el-dialog>
@@ -117,6 +131,7 @@
 </template>
 
 <script>
+import { message } from "./../../util/item";
 export default {
   name: "AlarmConfiguration",
   data: function() {
@@ -159,7 +174,11 @@
       ], //级别选项
       Dialog2factors: "", //因子
       Dialog2YZ: [], //因子选项
-      warnValue: "" //线值
+      warnValue: "", //线值
+      isAdd: true, //新增为true,修改为false
+      clickplatformCode: "", //点击站点时 保存当前站点所属得平台编号
+      clicksiteName: "", //点击站点时 保存当前站点名称
+      clickYinZiName: "" //选择因子时保存因子名称
     };
   },
   methods: {
@@ -225,9 +244,15 @@
     // 查看详情
     details(index, rows) {
       this.dialogVisible = true;
+      // 保存当前站点编号
       this.SiteSel = rows.stCode;
+      //  保存当前站点名称
+      this.clicksiteName = rows.stName;
+      // 保存当前站点所属得平台编号
+      this.clickplatformCode = rows.platformCode;
       this.loadGridDataYZ();
     },
+
     //分页
     YZSizeChange(val) {
       // 改变每页的条数
@@ -267,20 +292,66 @@
     // 点击编辑因子状态
     Edit(index, rows) {
       this.dialogVisible2 = true;
+      this.isAdd = false;
+      // 默认值回显
+      this.Dialog2warnType = rows.warnType;
+      this.Dialog2compareWay = rows.compareWay;
+      this.warnValue = rows.warnValue;
+      this.Dialog2YZ = [
+        { factorsName: rows.factorsName, factorsAscii: rows.factorsAscii }
+      ];
+      this.Dialog2factors = rows.factorsAscii;
+    },
+    // 删除
+    Del(index, rows) {
+      this.$confirm("此操作将永久删除该信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          var DelID = [];
+          DelID.push(rows.id);
+          this.$http
+            .post(this.nozzle.warnConfigDeleteWarnConfig, DelID)
+            .then(response => {
+              message(response);
+              this.dialogVisible2 = false;
+              this.loadGridDataYZ();
+            })
+            .catch(response => {
+              message(response);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除"
+          });
+        });
+    },
+    // 选择因子
+    Dialog2factorsChange(vId) {
+      let obj = {};
+      obj = this.Dialog2YZ.find(item => {
+        //这里的userList就是上面遍历的数据源
+        return item.factorsAscii === vId; //筛选出匹配数据
+      });
+      this.clickYinZiName = obj.factorsName; //我这边的name就是对应label的
     },
     // 请求未分配的因子
     loadSiteNoYinz() {
+      this.Dialog2YZ = [];
       let params = {
         data: {
-          stCode: this.SiteSel, //站点编号，可不传
+          stCode: this.SiteSel //站点编号，可不传
         }
       };
       this.$http
-        .post(this.nozzle.warnConfigListWarnConfig, params)
+        .post(this.nozzle.warnConfigListNonConfig, params)
         .then(response => {
           if (response.data.code === 200) {
-            this.YZTableData = response.data.data.records;
-            this.YZDatagridDataLength = response.data.data.total;
+            this.Dialog2YZ = response.data.data;
           } else {
             message(response);
           }
@@ -288,6 +359,63 @@
         .catch(response => {
           message(response);
         });
+    },
+    // 新增警戒线
+    AddJinJieXian() {
+      this.dialogVisible2 = true;
+      this.Dialog2warnType = "";
+      this.Dialog2compareWay = "";
+      this.Dialog2factors = "";
+      this.Dialog2YZ = [];
+      this.clickYinZiName = "";
+      this.warnValue = "";
+      this.isAdd = true;
+      this.loadSiteNoYinz();
+    },
+    //确认
+    EditAndAdd() {
+      var params2;
+      if (this.isAdd) {
+        // 新增
+        var URL = this.nozzle.warnConfigInsertWarnConfig;
+        params2 = {
+          data: {
+            siteNo: this.SiteSel, //站点编号
+            siteName: this.clicksiteName, //站点名称
+            platForm: this.clickplatformCode, //平台编号
+            factorsAscii: this.Dialog2factors, //因子ASCII
+            factorsName: this.clickYinZiName, //因子中文名
+            warnValue: this.warnValue, //警戒线值
+            warnType: this.Dialog2warnType, //警戒等级1：预警，2：报警
+            compareWay: this.Dialog2compareWay //比较方式>：大于，<：小于
+          }
+        };
+      } else {
+        // 修改
+        var URL = this.nozzle.warnConfigUpdateWarnConfig;
+        params2 = {
+          data: {
+            siteNo: this.SiteSel, //站点编号
+            factorsAscii: this.Dialog2factors, //因子ASCII
+            warnType: this.Dialog2warnType, //警戒等级1：预警，2：报警
+            // siteName: this.clicksiteName, //站点名称
+            // platForm: this.clickplatformCode, //平台编号
+            /**上三个参数固定，不让修改，但是要传给后台*/
+            warnValue: this.warnValue, //警戒线值
+            compareWay: this.Dialog2compareWay //比较方式>：大于，<：小于
+          }
+        };
+      }
+      this.$http
+        .post(URL, params2)
+        .then(response => {
+          message(response);
+          this.dialogVisible2 = false;
+          this.loadGridDataYZ();
+        })
+        .catch(response => {
+          message(response);
+        });
     }
   },
   mounted: function() {
diff --git a/src/util/project.js b/src/util/project.js
index 379c68e..d110c7c 100644
--- a/src/util/project.js
+++ b/src/util/project.js
@@ -14,7 +14,7 @@
   "warnLogGetWarnLogOfPlatform":"/warn/log/getWarnLogOfPlatform",//站点状况预览图-----查询该平台各站点各因子最新的报警数据
   "listStationBase":"/sys/site/listStationBase",//所有站点无分页
   "sysSiteListStationBaseWithPage":"/sys/site/listStationBaseWithPage",//所有站点有分页
-  "sysSiteListStationBaseWithPage":"/warn/config/listNonConfig",//获取选择站点未配置但已分配的因子
+  "warnConfigListNonConfig":"/warn/config/listNonConfig",//获取选择站点未配置但已分配的因子
   "warnConfigListWarnConfig":"/warn/config/listWarnConfig",//查询站点已配置的预警报警线
   "warnConfigGetSiteWarn":"/warn/config/getSiteWarn",//获取站点预警线
   "warnConfigInsertWarnConfig":"/warn/config/insertWarnConfig",//新增报警线